From ce9216e66cb2f5799ac712dd6eb63abb26de96e2 Mon Sep 17 00:00:00 2001
From: Douglas Eichelberger <dduugg@gmail.com>
Date: Fri, 6 Dec 2024 20:28:41 -0800
Subject: [PATCH] Fix use of tap

---
 Library/Homebrew/cli/args.rb                                   | 2 +-
 Library/Homebrew/dev-cmd/audit.rb                              | 2 +-
 Library/Homebrew/dev-cmd/bump.rb                               | 2 +-
 Library/Homebrew/dev-cmd/livecheck.rb                          | 2 +-
 Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/audit.rbi     | 3 ---
 Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi      | 3 ---
 Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/create.rbi    | 3 ---
 .../sorbet/rbi/dsl/homebrew/dev_cmd/dispatch_build_bottle.rbi  | 3 ---
 .../Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/livecheck_cmd.rbi | 3 ---
 .../Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_automerge.rbi  | 3 ---
 .../Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_publish.rbi    | 3 ---
 Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_pull.rbi   | 3 ---
 12 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
index 18e9c0c223..f3358bfc10 100644
--- a/Library/Homebrew/cli/args.rb
+++ b/Library/Homebrew/cli/args.rb
@@ -55,7 +55,7 @@ module Homebrew
         @table[name] = value
       end
 
-      sig { params(_blk: T.nilable(T.proc.params(x: T.untyped).void)).returns(T.untyped) }
+      sig { override.params(_blk: T.nilable(T.proc.params(x: T.untyped).void)).returns(T.untyped) }
       def tap(&_blk)
         return super if block_given? # Object#tap
 
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 21682ae9ed..03d9599e6c 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -125,7 +125,7 @@ module Homebrew
 
         audit_formulae, audit_casks = Homebrew.with_no_api_env do # audit requires full Ruby source
           if args.tap
-            Tap.fetch(T.must(args.tap)).then do |tap|
+            Tap.fetch(args.tap).then do |tap|
               [
                 tap.formula_files.map { |path| Formulary.factory(path) },
                 tap.cask_files.map { |path| Cask::CaskLoader.load(path) },
diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb
index 4b2be96bc9..f635e5b229 100644
--- a/Library/Homebrew/dev-cmd/bump.rb
+++ b/Library/Homebrew/dev-cmd/bump.rb
@@ -86,7 +86,7 @@ module Homebrew
               Formulary.factory(qualified_name)
             end
           elsif args.tap
-            tap = Tap.fetch(T.must(args.tap))
+            tap = Tap.fetch(args.tap)
             raise UsageError, "`--tap` requires `--auto` for official taps." if tap.official?
 
             formulae = args.cask? ? [] : tap.formula_files.map { |path| Formulary.factory(path) }
diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb
index b2ffcbdb16..b811ad4fe6 100644
--- a/Library/Homebrew/dev-cmd/livecheck.rb
+++ b/Library/Homebrew/dev-cmd/livecheck.rb
@@ -60,7 +60,7 @@ module Homebrew
 
         formulae_and_casks_to_check = Homebrew.with_no_api_env do
           if args.tap
-            tap = Tap.fetch(T.must(args.tap))
+            tap = Tap.fetch(args.tap)
             formulae = args.cask? ? [] : tap.formula_files.map { |path| Formulary.factory(path) }
             casks = args.formula? ? [] : tap.cask_files.map { |path| Cask::CaskLoader.load(path) }
             formulae + casks
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/audit.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/audit.rbi
index 9939567b9c..2665fe78c2 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/audit.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/audit.rbi
@@ -80,9 +80,6 @@ class Homebrew::DevCmd::Audit::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def strict?; end
 
-  sig { returns(T.nilable(String)) }
-  def tap; end
-
   sig { returns(T::Boolean) }
   def token_conflicts?; end
 end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi
index a44d6ec955..1e750628c4 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi
@@ -49,7 +49,4 @@ class Homebrew::DevCmd::Bump::Args < Homebrew::CLI::Args
 
   sig { returns(T.nilable(String)) }
   def start_with; end
-
-  sig { returns(T.nilable(String)) }
-  def tap; end
 end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/create.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/create.rbi
index bbfe7510c9..3d94822e23 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/create.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/create.rbi
@@ -64,7 +64,4 @@ class Homebrew::DevCmd::Create::Args < Homebrew::CLI::Args
 
   sig { returns(T.nilable(String)) }
   def set_version; end
-
-  sig { returns(T.nilable(String)) }
-  def tap; end
 end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/dispatch_build_bottle.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/dispatch_build_bottle.rbi
index 1b71f8cc0f..3f45ac1ca5 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/dispatch_build_bottle.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/dispatch_build_bottle.rbi
@@ -26,9 +26,6 @@ class Homebrew::DevCmd::DispatchBuildBottle::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(T::Array[String])) }
   def macos; end
 
-  sig { returns(T.nilable(String)) }
-  def tap; end
-
   sig { returns(T.nilable(String)) }
   def timeout; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/livecheck_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/livecheck_cmd.rbi
index 747ea49b71..0729c85370 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/livecheck_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/livecheck_cmd.rbi
@@ -46,7 +46,4 @@ class Homebrew::DevCmd::LivecheckCmd::Args < Homebrew::CLI::Args
 
   sig { returns(T::Boolean) }
   def resources?; end
-
-  sig { returns(T.nilable(String)) }
-  def tap; end
 end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_automerge.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_automerge.rbi
index d2b63c6ab0..f16fc3dbee 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_automerge.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_automerge.rbi
@@ -20,9 +20,6 @@ class Homebrew::DevCmd::PrAutomerge::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def publish?; end
 
-  sig { returns(T.nilable(String)) }
-  def tap; end
-
   sig { returns(T.nilable(String)) }
   def with_label; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_publish.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_publish.rbi
index c1eff16f78..820496cff5 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_publish.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_publish.rbi
@@ -23,9 +23,6 @@ class Homebrew::DevCmd::PrPublish::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def message; end
 
-  sig { returns(T.nilable(String)) }
-  def tap; end
-
   sig { returns(T.nilable(String)) }
   def workflow; end
 end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_pull.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_pull.rbi
index 8a8ac7add7..ec30c08923 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_pull.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_pull.rbi
@@ -65,9 +65,6 @@ class Homebrew::DevCmd::PrPull::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def root_url_using; end
 
-  sig { returns(T.nilable(String)) }
-  def tap; end
-
   sig { returns(T::Boolean) }
   def warn_on_upload_failure?; end