From a4b063eb44b60100129d19913b631b1d0337f0f9 Mon Sep 17 00:00:00 2001
From: Douglas Eichelberger <dduugg@gmail.com>
Date: Sun, 8 Sep 2024 17:33:54 -0700
Subject: [PATCH] fix regressions

---
 Library/Homebrew/formula_installer.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index fdd10ab1083dd6..ac9551d73da755 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -548,9 +548,9 @@ def check_conflicts
 
   # Compute and collect the dependencies needed by the formula currently
   # being installed.
-  sig { params(use_cache: T::Boolean).returns(T::Array[[Dependency, T::Hash[String, Options]]]) }
+  sig { params(use_cache: T::Boolean).returns(T::Array[[Dependency, Options]]) }
   def compute_dependencies(use_cache: true)
-    @compute_dependencies = T.let(nil, T.nilable(T::Array[[Dependency, T::Hash[String, Options]]])) unless use_cache
+    @compute_dependencies = T.let(nil, T.nilable(T::Array[[Dependency, Options]])) unless use_cache
     @compute_dependencies ||= begin
       # Needs to be done before expand_dependencies
       fetch_bottle_tab if pour_bottle?
@@ -560,7 +560,7 @@ def compute_dependencies(use_cache: true)
     end
   end
 
-  sig { params(deps: T::Array[[Dependency, T::Hash[String, Options]]]).returns(T::Array[Formula]) }
+  sig { params(deps: T::Array[[Dependency, Options]]).returns(T::Array[Formula]) }
   def unbottled_dependencies(deps)
     deps.map { |(dep, _options)| dep.to_formula }.reject do |dep_f|
       next false unless dep_f.pour_bottle?
@@ -666,7 +666,7 @@ def expand_dependencies_for_formula(formula, inherited_options)
     end
   end
 
-  sig { returns(T::Array[[Dependency, T::Hash[String, Options]]]) }
+  sig { returns(T::Array[[Dependency, Options]]) }
   def expand_dependencies
     inherited_options = Hash.new { |hash, key| hash[key] = Options.new }
 
@@ -705,7 +705,7 @@ def inherited_options_for(dep)
     inherited_options
   end
 
-  sig { params(deps: T::Array[[Dependency, T::Hash[String, Options]]]).void }
+  sig { params(deps: T::Array[[Dependency, Options]]).void }
   def install_dependencies(deps)
     if deps.empty? && only_deps?
       puts "All dependencies for #{formula.full_name} are satisfied."
@@ -744,7 +744,7 @@ def fetch_dependency(dep)
     fi.fetch
   end
 
-  sig { params(dep: Dependency, inherited_options: T.any(Options, T::Hash[String, Options])).void }
+  sig { params(dep: Dependency, inherited_options: Options).void }
   def install_dependency(dep, inherited_options)
     df = dep.to_formula