diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml index ffb472cd3e..4e029176cf 100644 --- a/Library/.rubocop.yml +++ b/Library/.rubocop.yml @@ -183,7 +183,6 @@ Naming/MethodName: - '\A(fetch_)?HEAD\?\Z' # allow those that are standard -# TODO: try to remove some of these Naming/MethodParameterName: inherit_mode: merge: @@ -194,7 +193,6 @@ Naming/MethodParameterName: "b", "c1", "c2", - "d", "e", "f", "ff", diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb index 32954f6b0c..ca0787cfab 100644 --- a/Library/Homebrew/cleaner.rb +++ b/Library/Homebrew/cleaner.rb @@ -117,8 +117,8 @@ class Cleaner # # lib may have a large directory tree (see Erlang for instance), and # clean_dir applies cleaning rules to the entire tree - def clean_dir(d) - d.find do |path| + def clean_dir(directory) + directory.find do |path| path.extend(ObserverPathnameExtension) Find.prune if @f.skip_clean? path diff --git a/Library/Homebrew/cmd/deps.rb b/Library/Homebrew/cmd/deps.rb index f04add7c65..d381f546be 100644 --- a/Library/Homebrew/cmd/deps.rb +++ b/Library/Homebrew/cmd/deps.rb @@ -196,17 +196,17 @@ module Homebrew str end - def self.deps_for_dependent(d, args:, recursive: false) + def self.deps_for_dependent(dependency, args:, recursive: false) includes, ignores = args_includes_ignores(args) - deps = d.runtime_dependencies if @use_runtime_dependencies + deps = dependency.runtime_dependencies if @use_runtime_dependencies if recursive - deps ||= recursive_includes(Dependency, d, includes, ignores) - reqs = recursive_includes(Requirement, d, includes, ignores) + deps ||= recursive_includes(Dependency, dependency, includes, ignores) + reqs = recursive_includes(Requirement, dependency, includes, ignores) else - deps ||= reject_ignores(d.deps, ignores, includes) - reqs = reject_ignores(d.requirements, ignores, includes) + deps ||= reject_ignores(dependency.deps, ignores, includes) + reqs = reject_ignores(dependency.requirements, ignores, includes) end deps + reqs.to_a