Merge pull request #15800 from dduugg/inreplace-paths

Narrow member type of inreplace paths enumerable
Homebrew · Aug 1, 2023 · 7994173 · 7994173
2 parents 8a74f83 + b26c091
commit 7994173
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
@@ -2556,7 +2556,7 @@ def install; end
   # @api public
   sig {
     params(
-      paths:        T.any(T::Enumerable[T.untyped], String, Pathname),
+      paths:        T.any(T::Enumerable[T.any(String, Pathname)], String, Pathname),
       before:       T.nilable(T.any(Pathname, Regexp, String)),
       after:        T.nilable(T.any(Pathname, String, Symbol)),
       audit_result: T::Boolean,

diff --git a/Library/Homebrew/utils/inreplace.rb b/Library/Homebrew/utils/inreplace.rb
@@ -39,21 +39,22 @@ def initialize(errors)
     # @api public
     sig {
       params(
-        paths:        T.any(T::Array[T.untyped], String, Pathname),
+        paths:        T.any(T::Enumerable[T.any(String, Pathname)], String, Pathname),
         before:       T.nilable(T.any(Pathname, Regexp, String)),
         after:        T.nilable(T.any(Pathname, String, Symbol)),
         audit_result: T::Boolean,
       ).void
     }
     def inreplace(paths, before = nil, after = nil, audit_result = true) # rubocop:disable Style/OptionalBooleanParameter
+      paths = Array(paths)
       after &&= after.to_s
       before = before.to_s if before.is_a?(Pathname)
 
       errors = {}
 
-      errors["`paths` (first) parameter"] = ["`paths` was empty"] if paths.blank?
+      errors["`paths` (first) parameter"] = ["`paths` was empty"] if paths.all?(&:blank?)
 
-      Array(paths).each do |path|
+      paths.each do |path|
         str = File.binread(path)
         s = StringInreplaceExtension.new(str)