From 23abe3723426236597f0571f257ed54d4603d998 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Tue, 7 Mar 2023 23:35:07 +0000
Subject: [PATCH 01/10] rubocop: Trim `Naming/MethodParameterName` allowlist
 based on defaults

- These are already included in
  https://github.com/rubocop/rubocop/blob/6136ffd91e8d6fba22d6fb44ec8498a5d43537d0/config/default.yml#L2834-L2862
  upstream default allowed method names, so we don't need them here too.
- Practically this makes no difference since the `inherit_mode` is
  `merge` it'll just merge the two, but for tidiness I thought I'd do
  this anyway since the duplication annoyed me.
---
 Library/.rubocop.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 38996b0fba..fbf732a8e1 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -192,7 +192,6 @@ Naming/MethodParameterName:
     [
       "a",
       "b",
-      "cc",
       "c1",
       "c2",
       "d",
@@ -200,7 +199,6 @@ Naming/MethodParameterName:
       "f",
       "ff",
       "fn",
-      "id",
       "o",
       "p",
       "pr",

From 3e7a46f474e3c7e9949cb1a77c17518496de4c66 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Tue, 7 Mar 2023 23:42:00 +0000
Subject: [PATCH 02/10] rubocop: Drop "v" from `Naming/MethodParameterName`
 allowlist

- This was an easy fix, "v" => "version".
---
 Library/.rubocop.yml             |  1 -
 Library/Homebrew/formula.rb      | 14 +++++++-------
 Library/Homebrew/os/linux.rb     |  2 +-
 Library/Homebrew/os/mac.rb       | 16 ++++++++--------
 Library/Homebrew/os/mac/sdk.rb   | 16 ++++++++--------
 Library/Homebrew/os/mac/xcode.rb | 24 ++++++++++++------------
 6 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index fbf732a8e1..152548db89 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -205,7 +205,6 @@ Naming/MethodParameterName:
       "r",
       "rb",
       "s",
-      "v",
     ]
 
 # Both styles are used depending on context,
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 9bc26ff729..15a31fd0d9 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -622,9 +622,9 @@ class Formula
   # This directory points to {#opt_prefix} if it exists and if #{prefix} is not
   # called from within the same formula's {#install} or {#post_install} methods.
   # Otherwise, return the full path to the formula's versioned cellar.
-  def prefix(v = pkg_version)
-    versioned_prefix = versioned_prefix(v)
-    if !@prefix_returns_versioned_prefix && v == pkg_version &&
+  def prefix(version = pkg_version)
+    versioned_prefix = versioned_prefix(version)
+    if !@prefix_returns_versioned_prefix && version == pkg_version &&
        versioned_prefix.directory? && Keg.new(versioned_prefix).optlinked?
       opt_prefix
     else
@@ -643,10 +643,10 @@ class Formula
   end
 
   # If a formula's linked keg points to the prefix.
-  def prefix_linked?(v = pkg_version)
+  def prefix_linked?(version = pkg_version)
     return false unless linked?
 
-    linked_keg.resolved_path == versioned_prefix(v)
+    linked_keg.resolved_path == versioned_prefix(version)
   end
 
   # {PkgVersion} of the linked keg for the formula.
@@ -2636,8 +2636,8 @@ class Formula
 
   # Returns the prefix for a given formula version number.
   # @private
-  def versioned_prefix(v)
-    rack/v
+  def versioned_prefix(version)
+    rack/version
   end
 
   def exec_cmd(cmd, args, out, logfn)
diff --git a/Library/Homebrew/os/linux.rb b/Library/Homebrew/os/linux.rb
index 03be4769e8..f9e964e307 100644
--- a/Library/Homebrew/os/linux.rb
+++ b/Library/Homebrew/os/linux.rb
@@ -78,7 +78,7 @@ module OS
       false
     end
 
-    def sdk_path_if_needed(_v = nil)
+    def sdk_path_if_needed(_version = nil)
       nil
     end
 
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index c4089721bc..5c91ca41b3 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -113,11 +113,11 @@ module OS
       end
     end
 
-    def sdk(v = nil)
-      sdk_locator.sdk_if_applicable(v)
+    def sdk(version = nil)
+      sdk_locator.sdk_if_applicable(version)
     end
 
-    def sdk_for_formula(f, v = nil, check_only_runtime_requirements: false)
+    def sdk_for_formula(f, version = nil, check_only_runtime_requirements: false)
       # If the formula requires Xcode, don't return the CLT SDK
       # If check_only_runtime_requirements is true, don't necessarily return the
       # Xcode SDK if the XcodeRequirement is only a build or test requirement.
@@ -128,16 +128,16 @@ module OS
         true
       end
 
-      sdk(v)
+      sdk(version)
     end
 
     # Returns the path to an SDK or nil, following the rules set by {sdk}.
-    def sdk_path(v = nil)
-      s = sdk(v)
+    def sdk_path(version = nil)
+      s = sdk(version)
       s&.path
     end
 
-    def sdk_path_if_needed(v = nil)
+    def sdk_path_if_needed(version = nil)
       # Prefer CLT SDK when both Xcode and the CLT are installed.
       # Expected results:
       # 1. On Xcode-only systems, return the Xcode SDK.
@@ -148,7 +148,7 @@ module OS
 
       return unless sdk_root_needed?
 
-      sdk_path(v)
+      sdk_path(version)
     end
 
     # See these issues for some history:
diff --git a/Library/Homebrew/os/mac/sdk.rb b/Library/Homebrew/os/mac/sdk.rb
index 28f838cfdc..3fadf31762 100644
--- a/Library/Homebrew/os/mac/sdk.rb
+++ b/Library/Homebrew/os/mac/sdk.rb
@@ -42,9 +42,9 @@ module OS
 
       class NoSDKError < StandardError; end
 
-      sig { params(v: OS::Mac::Version).returns(SDK) }
-      def sdk_for(v)
-        sdk = all_sdks.find { |s| s.version == v }
+      sig { params(version: OS::Mac::Version).returns(SDK) }
+      def sdk_for(version)
+        sdk = all_sdks.find { |s| s.version == version }
         raise NoSDKError if sdk.nil?
 
         sdk
@@ -80,13 +80,13 @@ module OS
         @all_sdks
       end
 
-      sig { params(v: T.nilable(OS::Mac::Version)).returns(T.nilable(SDK)) }
-      def sdk_if_applicable(v = nil)
+      sig { params(version: T.nilable(OS::Mac::Version)).returns(T.nilable(SDK)) }
+      def sdk_if_applicable(version = nil)
         sdk = begin
-          if v.blank?
+          if version.blank?
             sdk_for OS::Mac.version
           else
-            sdk_for v
+            sdk_for version
           end
         rescue NoSDKError
           latest_sdk
@@ -95,7 +95,7 @@ module OS
 
         # On OSs lower than 11, whenever the major versions don't match,
         # only return an SDK older than the OS version if it was specifically requested
-        return if v.blank? && sdk.version < OS::Mac.version
+        return if version.blank? && sdk.version < OS::Mac.version
 
         sdk
       end
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 1004b38d8b..39deb1052a 100755
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -140,14 +140,14 @@ module OS
         @sdk_locator ||= XcodeSDKLocator.new
       end
 
-      sig { params(v: T.nilable(MacOS::Version)).returns(T.nilable(SDK)) }
-      def sdk(v = nil)
-        sdk_locator.sdk_if_applicable(v)
+      sig { params(version: T.nilable(MacOS::Version)).returns(T.nilable(SDK)) }
+      def sdk(version = nil)
+        sdk_locator.sdk_if_applicable(version)
       end
 
-      sig { params(v: T.nilable(MacOS::Version)).returns(T.nilable(Pathname)) }
-      def sdk_path(v = nil)
-        sdk(v)&.path
+      sig { params(version: T.nilable(MacOS::Version)).returns(T.nilable(Pathname)) }
+      def sdk_path(version = nil)
+        sdk(version)&.path
       end
 
       sig { returns(String) }
@@ -290,14 +290,14 @@ module OS
         @sdk_locator ||= CLTSDKLocator.new
       end
 
-      sig { params(v: T.nilable(MacOS::Version)).returns(T.nilable(SDK)) }
-      def sdk(v = nil)
-        sdk_locator.sdk_if_applicable(v)
+      sig { params(version: T.nilable(MacOS::Version)).returns(T.nilable(SDK)) }
+      def sdk(version = nil)
+        sdk_locator.sdk_if_applicable(version)
       end
 
-      sig { params(v: T.nilable(MacOS::Version)).returns(T.nilable(Pathname)) }
-      def sdk_path(v = nil)
-        sdk(v)&.path
+      sig { params(version: T.nilable(MacOS::Version)).returns(T.nilable(Pathname)) }
+      def sdk_path(version = nil)
+        sdk(version)&.path
       end
 
       sig { returns(String) }

From 6d822d9a62564c0e934b97cc091efbb32cf70f2c Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Tue, 7 Mar 2023 23:48:52 +0000
Subject: [PATCH 03/10] rubocop: Drop "fn" from `Naming/MethodParameterName`
 allowlist

- I originally thought this was short for "function", but upon closer
  inspection all its usages are to do with filenames. So, use "filename",
  it's clearer.
---
 Library/.rubocop.yml              |  1 -
 Library/Homebrew/cask/download.rb |  8 ++++----
 Library/Homebrew/formula.rb       |  4 ++--
 Library/Homebrew/readall.rb       |  4 ++--
 Library/Homebrew/resource.rb      | 12 ++++++------
 Library/Homebrew/software_spec.rb |  2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 152548db89..3c17e6743c 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -198,7 +198,6 @@ Naming/MethodParameterName:
       "e",
       "f",
       "ff",
-      "fn",
       "o",
       "p",
       "pr",
diff --git a/Library/Homebrew/cask/download.rb b/Library/Homebrew/cask/download.rb
index 4c80eb2628..c902fbc933 100644
--- a/Library/Homebrew/cask/download.rb
+++ b/Library/Homebrew/cask/download.rb
@@ -57,7 +57,7 @@ module Cask
       downloader.basename
     end
 
-    def verify_download_integrity(fn)
+    def verify_download_integrity(filename)
       if @cask.sha256 == :no_check
         opoo "No checksum defined for cask '#{@cask}', skipping verification."
         return
@@ -65,13 +65,13 @@ module Cask
 
       begin
         ohai "Verifying checksum for cask '#{@cask}'" if verbose?
-        fn.verify_checksum(@cask.sha256)
+        filename.verify_checksum(@cask.sha256)
       rescue ChecksumMissingError
         opoo <<~EOS
-          Cannot verify integrity of '#{fn.basename}'.
+          Cannot verify integrity of '#{filename.basename}'.
           No checksum was provided for this cask.
           For your reference, the checksum is:
-            sha256 "#{fn.sha256}"
+            sha256 "#{filename.sha256}"
         EOS
       end
     end
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 15a31fd0d9..f1cb4090d3 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -2281,8 +2281,8 @@ class Formula
   end
 
   # @private
-  def verify_download_integrity(fn)
-    active_spec.verify_download_integrity(fn)
+  def verify_download_integrity(filename)
+    active_spec.verify_download_integrity(filename)
   end
 
   # @private
diff --git a/Library/Homebrew/readall.rb b/Library/Homebrew/readall.rb
index a8ba6ab119..f562573618 100644
--- a/Library/Homebrew/readall.rb
+++ b/Library/Homebrew/readall.rb
@@ -118,9 +118,9 @@ module Readall
 
     private
 
-    def syntax_errors_or_warnings?(rb)
+    def syntax_errors_or_warnings?(filename)
       # Retrieve messages about syntax errors/warnings printed to `$stderr`.
-      _, err, status = system_command(RUBY_PATH, args: ["-c", "-w", rb], print_stderr: false)
+      _, err, status = system_command(RUBY_PATH, args: ["-c", "-w", filename], print_stderr: false)
 
       # Ignore unnecessary warning about named capture conflicts.
       # See https://bugs.ruby-lang.org/issues/12359.
diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index 70839a3b73..5639184d8f 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -187,17 +187,17 @@ class Resource
     download
   end
 
-  def verify_download_integrity(fn)
-    if fn.file?
-      ohai "Verifying checksum for '#{fn.basename}'" if verbose?
-      fn.verify_checksum(checksum)
+  def verify_download_integrity(filename)
+    if filename.file?
+      ohai "Verifying checksum for '#{filename.basename}'" if verbose?
+      filename.verify_checksum(checksum)
     end
   rescue ChecksumMissingError
     opoo <<~EOS
-      Cannot verify integrity of '#{fn.basename}'.
+      Cannot verify integrity of '#{filename.basename}'.
       No checksum was provided for this resource.
       For your reference, the checksum is:
-        sha256 "#{fn.sha256}"
+        sha256 "#{filename.sha256}"
     EOS
   end
 
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index df7353df8b..5d15185e85 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -286,7 +286,7 @@ class HeadSoftwareSpec < SoftwareSpec
     @resource.version = Version.create("HEAD")
   end
 
-  def verify_download_integrity(_fn)
+  def verify_download_integrity(_filename)
     # no-op
   end
 end

From 87042c0237425a4408e9f843eff5de506eafe382 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Tue, 7 Mar 2023 23:50:56 +0000
Subject: [PATCH 04/10] rubocop: Drop "rb" from `Naming/MethodParameterName`
 allowlist

- It's entirely unused as a parameter name.
---
 Library/.rubocop.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 3c17e6743c..86d7fa2eed 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -202,7 +202,6 @@ Naming/MethodParameterName:
       "p",
       "pr",
       "r",
-      "rb",
       "s",
     ]
 

From 89fb8c78e827691673c81ad7ceb437aebcde85e5 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Tue, 7 Mar 2023 23:55:16 +0000
Subject: [PATCH 05/10] rubocop: Drop "s" from `Naming/MethodParameterName`
 allowlist

- Most usages of this were in the `pretty_duration` method, where "s"
  is better described as "seconds" since we're calculating a duration.
- I also took the executive decision to do the same to "m" which refers
  to "minutes".
---
 Library/.rubocop.yml                     |  1 -
 Library/Homebrew/extend/kernel.rb        | 22 +++++++++++-----------
 Library/Homebrew/formula_text_auditor.rb |  4 ++--
 Library/Homebrew/utils/formatter.rb      | 12 ++++++------
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 86d7fa2eed..ad7c5f873b 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -202,7 +202,6 @@ Naming/MethodParameterName:
       "p",
       "pr",
       "r",
-      "s",
     ]
 
 # Both styles are used depending on context,
diff --git a/Library/Homebrew/extend/kernel.rb b/Library/Homebrew/extend/kernel.rb
index e152d53c69..ab86f7c36b 100644
--- a/Library/Homebrew/extend/kernel.rb
+++ b/Library/Homebrew/extend/kernel.rb
@@ -192,20 +192,20 @@ module Kernel
     end
   end
 
-  def pretty_duration(s)
-    s = s.to_i
+  def pretty_duration(seconds)
+    seconds = seconds.to_i
     res = +""
 
-    if s > 59
-      m = s / 60
-      s %= 60
-      res = +"#{m} #{Utils.pluralize("minute", m)}"
-      return res.freeze if s.zero?
+    if seconds > 59
+      minutes = seconds / 60
+      seconds %= 60
+      res = +"#{minutes} #{Utils.pluralize("minute", minutes)}"
+      return res.freeze if seconds.zero?
 
       res << " "
     end
 
-    res << "#{s} #{Utils.pluralize("second", s)}"
+    res << "#{seconds} #{Utils.pluralize("second", seconds)}"
     res.freeze
   end
 
@@ -471,14 +471,14 @@ module Kernel
   # preserving character encoding validity. The returned string will
   # be not much longer than the specified max_bytes, though the exact
   # shortfall or overrun may vary.
-  def truncate_text_to_approximate_size(s, max_bytes, options = {})
+  def truncate_text_to_approximate_size(str, max_bytes, options = {})
     front_weight = options.fetch(:front_weight, 0.5)
     raise "opts[:front_weight] must be between 0.0 and 1.0" if front_weight < 0.0 || front_weight > 1.0
-    return s if s.bytesize <= max_bytes
+    return str if str.bytesize <= max_bytes
 
     glue = "\n[...snip...]\n"
     max_bytes_in = [max_bytes - glue.bytesize, 1].max
-    bytes = s.dup.force_encoding("BINARY")
+    bytes = str.dup.force_encoding("BINARY")
     glue_bytes = glue.encode("BINARY")
     n_front_bytes = (max_bytes_in * front_weight).floor
     n_back_bytes = max_bytes_in - n_front_bytes
diff --git a/Library/Homebrew/formula_text_auditor.rb b/Library/Homebrew/formula_text_auditor.rb
index 5a83ef53f4..23a6eca104 100644
--- a/Library/Homebrew/formula_text_auditor.rb
+++ b/Library/Homebrew/formula_text_auditor.rb
@@ -23,8 +23,8 @@ module Homebrew
       other =~ @text
     end
 
-    def include?(s)
-      @text.include? s
+    def include?(str)
+      @text.include? str
     end
 
     def to_s
diff --git a/Library/Homebrew/utils/formatter.rb b/Library/Homebrew/utils/formatter.rb
index eabd47549a..fedd5fd490 100644
--- a/Library/Homebrew/utils/formatter.rb
+++ b/Library/Homebrew/utils/formatter.rb
@@ -50,14 +50,14 @@ module Formatter
   # so we always wrap one word before an option.
   # @see https://github.com/Homebrew/brew/pull/12672
   # @see https://macromates.com/blog/2006/wrapping-text-with-regular-expressions/
-  def format_help_text(s, width: 172)
+  def format_help_text(str, width: 172)
     desc = OPTION_DESC_WIDTH
     indent = width - desc
-    s.gsub(/(?<=\S) *\n(?=\S)/, " ")
-     .gsub(/([`>)\]]:) /, "\\1\n    ")
-     .gsub(/^( +-.+  +(?=\S.{#{desc}}))(.{1,#{desc}})( +|$)(?!-)\n?/, "\\1\\2\n#{" " * indent}")
-     .gsub(/^( {#{indent}}(?=\S.{#{desc}}))(.{1,#{desc}})( +|$)(?!-)\n?/, "\\1\\2\n#{" " * indent}")
-     .gsub(/(.{1,#{width}})( +|$)(?!-)\n?/, "\\1\n")
+    str.gsub(/(?<=\S) *\n(?=\S)/, " ")
+       .gsub(/([`>)\]]:) /, "\\1\n    ")
+       .gsub(/^( +-.+  +(?=\S.{#{desc}}))(.{1,#{desc}})( +|$)(?!-)\n?/, "\\1\\2\n#{" " * indent}")
+       .gsub(/^( {#{indent}}(?=\S.{#{desc}}))(.{1,#{desc}})( +|$)(?!-)\n?/, "\\1\\2\n#{" " * indent}")
+       .gsub(/(.{1,#{width}})( +|$)(?!-)\n?/, "\\1\n")
   end
 
   def url(string)

From 0cd616bc66169a7068df92bb6a6a75e1b74fd2a6 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Wed, 8 Mar 2023 00:14:10 +0000
Subject: [PATCH 06/10] rubocop: Drop "r" from `Naming/MethodParameterName`
 allowlist

- This stands for "resource" in our case, so use the long name.
---
 Library/.rubocop.yml          |  1 -
 Library/Homebrew/cmd/fetch.rb | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index ad7c5f873b..3f98946d2d 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -201,7 +201,6 @@ Naming/MethodParameterName:
       "o",
       "p",
       "pr",
-      "r",
     ]
 
 # Both styles are used depending on context,
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb
index 24234c7150..9c00468be7 100644
--- a/Library/Homebrew/cmd/fetch.rb
+++ b/Library/Homebrew/cmd/fetch.rb
@@ -130,12 +130,12 @@ module Homebrew
     end
   end
 
-  def self.fetch_resource(r, args:)
-    puts "Resource: #{r.name}"
-    fetch_fetchable r, args: args
+  def self.fetch_resource(resource, args:)
+    puts "Resource: #{resource.name}"
+    fetch_fetchable resource, args: args
   rescue ChecksumMismatchError => e
-    retry if retry_fetch?(r, args: args)
-    opoo "Resource #{r.name} reports different sha256: #{e.expected}"
+    retry if retry_fetch?(resource, args: args)
+    opoo "Resource #{resource.name} reports different sha256: #{e.expected}"
   end
 
   def self.fetch_formula(f, args:)

From e273c25be06289ad6db8ad3986018237e8d8ece3 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Wed, 8 Mar 2023 00:15:17 +0000
Subject: [PATCH 07/10] rubocop: Drop "p" from `Naming/MethodParameterName`
 allowlist

- It's used to refer to a patch, so use the long name.
---
 Library/.rubocop.yml          | 1 -
 Library/Homebrew/cmd/fetch.rb | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 3f98946d2d..ffb472cd3e 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -199,7 +199,6 @@ Naming/MethodParameterName:
       "f",
       "ff",
       "o",
-      "p",
       "pr",
     ]
 
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb
index 9c00468be7..49b12e514b 100644
--- a/Library/Homebrew/cmd/fetch.rb
+++ b/Library/Homebrew/cmd/fetch.rb
@@ -152,8 +152,8 @@ module Homebrew
     opoo "Cask reports different sha256: #{e.expected}"
   end
 
-  def self.fetch_patch(p, args:)
-    fetch_fetchable p, args: args
+  def self.fetch_patch(patch, args:)
+    fetch_fetchable patch, args: args
   rescue ChecksumMismatchError => e
     opoo "Patch reports different sha256: #{e.expected}"
     Homebrew.failed = true

From a3211f4d7fd54285caadbb2d8928d64a1ab605d7 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Wed, 8 Mar 2023 00:27:19 +0000
Subject: [PATCH 08/10] rubocop: Drop "d" from `Naming/MethodParameterName`
 allowlist

---
 Library/.rubocop.yml         |  2 --
 Library/Homebrew/cleaner.rb  |  4 ++--
 Library/Homebrew/cmd/deps.rb | 12 ++++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

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

From f52fbaf917391eea82b360bc42654c9219f60843 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Wed, 8 Mar 2023 00:29:47 +0000
Subject: [PATCH 09/10] rubocop: Drop "ff" from `Naming/MethodParameterName`
 allowlist

- It seems that "ff" was short for plural formula, so formulae.
---
 Library/.rubocop.yml           | 1 -
 Library/Homebrew/diagnostic.rb | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 4e029176cf..5d0f41d952 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -195,7 +195,6 @@ Naming/MethodParameterName:
       "c2",
       "e",
       "f",
-      "ff",
       "o",
       "pr",
     ]
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index 3d1c512a22..821564e658 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -17,9 +17,9 @@ module Homebrew
   #
   # @api private
   module Diagnostic
-    def self.missing_deps(ff, hide = nil)
+    def self.missing_deps(formulae, hide = nil)
       missing = {}
-      ff.each do |f|
+      formulae.each do |f|
         missing_dependencies = f.missing_dependencies(hide: hide)
         next if missing_dependencies.empty?
 

From e1c455585b646c398ace44d577538c725d663648 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Wed, 8 Mar 2023 12:49:47 +0000
Subject: [PATCH 10/10] rubocop: Reinstate TODO for
 `Naming/MethodParameterName`

Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/.rubocop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 5d0f41d952..c3eda5bebd 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -182,7 +182,7 @@ Naming/MethodName:
   AllowedPatterns:
     - '\A(fetch_)?HEAD\?\Z'
 
-# allow those that are standard
+# TODO: remove all of these
 Naming/MethodParameterName:
   inherit_mode:
     merge: