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) }