From 6d822d9a62564c0e934b97cc091efbb32cf70f2c Mon Sep 17 00:00:00 2001 From: Issy Long Date: Tue, 7 Mar 2023 23:48:52 +0000 Subject: [PATCH] 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