Let’s see if these come back with green Sorbet?

Co-authored-by: Mike McQuaid <mike@mikemcquaid.com> Co-authored-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
Homebrew · Sep 22, 2024 · 26c6d5a · 26c6d5a
1 parent 404666b
commit 26c6d5a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/Library/Homebrew/cask/migrator.rb b/Library/Homebrew/cask/migrator.rb
@@ -39,7 +39,8 @@ def migrate(dry_run: false)
       old_caskroom_path = old_cask.caskroom_path
       new_caskroom_path = new_cask.caskroom_path
 
-      return if (old_caskfile = old_cask.installed_caskfile).nil?
+      old_caskfile = old_cask.installed_caskfile
+      return if old_caskfile.nil?
 
       old_installed_caskfile = old_caskfile.relative_path_from(old_caskroom_path)
       new_installed_caskfile = old_installed_caskfile.dirname/old_installed_caskfile.basename.sub(

diff --git a/Library/Homebrew/formula_cellar_checks.rb b/Library/Homebrew/formula_cellar_checks.rb
@@ -444,9 +444,9 @@ def relative_glob(dir, pattern)
     File.directory?(dir) ? Dir.chdir(dir) { Dir[pattern] } : []
   end
 
-  sig { params(file: T.any(Pathname, String), objdump: String).returns(T::Boolean) }
-  def cpuid_instruction?(file, objdump = "objdump")
-    @instruction_column_index ||= T.let({}, T.nilable(T::Hash[String, T.untyped]))
+  sig { params(file: T.any(Pathname, String), objdump: Pathname).returns(T::Boolean) }
+  def cpuid_instruction?(file, objdump)
+    @instruction_column_index ||= T.let({}, T.nilable(T::Hash[String, Integer]))
     @instruction_column_index[objdump] ||= begin
       objdump_version = Utils.popen_read(objdump, "--version")
 

diff --git a/Library/Homebrew/help.rb b/Library/Homebrew/help.rb
@@ -12,7 +12,7 @@ module Help
         cmd: T.nilable(String),
         empty_argv: T::Boolean,
         usage_error: T.nilable(String),
-        remaining_args: T.nilable(T::Array[String])
+        remaining_args: T::Array[String])
       ).void
     }
     def self.help(cmd = nil, empty_argv: false, usage_error: nil, remaining_args: [])
@@ -51,7 +51,7 @@ def self.help(cmd = nil, empty_argv: false, usage_error: nil, remaining_args: []
       params(
         cmd: String,
         path: Pathname,
-        remaining_args: T.nilable(T::Array[String]),
+        remaining_args: T::Array[String],
       ).returns(String)
     }
     def self.command_help(cmd, path, remaining_args:)
@@ -76,7 +76,7 @@ def self.command_help(cmd, path, remaining_args:)
     sig {
       params(
         path: Pathname,
-        remaining_args: T.nilable(T::Array[String])
+        remaining_args: T::Array[String]
       ).returns(T.nilable(String))
     }
     def self.parser_help(path, remaining_args:)
@@ -91,12 +91,12 @@ def self.parser_help(path, remaining_args:)
     end
     private_class_method :parser_help
 
-    sig { params(path: Pathname).returns(T::Array[T.nilable(String)]) }
+    sig { params(path: Pathname).returns(T::Array[String]) }
     def self.command_help_lines(path)
       path.read
           .lines
           .grep(/^#:/)
-          .map { |line| line.slice(2..-1)&.delete_prefix("  ") }
+          .filter_map { |line| line.slice(2..-1)&.delete_prefix("  ") }
     end
     private_class_method :command_help_lines