From 0c86425d6a360976a467d2887ab288d570368d24 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Sat, 11 Mar 2023 00:06:09 +0000 Subject: [PATCH] rubocop: Drop "o" from `Naming/MethodParameterName` allowlist - I couldn't figure out what this would stand for, so I asked on Slack if anyone had better ideas otherwise I'd go with "ostrich" or "octopus". Rylan suggested "option", which is very sensible. --- Library/.rubocop.yml | 1 - Library/Homebrew/build_environment.rb | 6 +++--- Library/Homebrew/options.rb | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml index e973eb6bc2..e5ff71dfad 100644 --- a/Library/.rubocop.yml +++ b/Library/.rubocop.yml @@ -189,7 +189,6 @@ Naming/MethodParameterName: - AllowedNames AllowedNames: [ - "o", "pr", ] diff --git a/Library/Homebrew/build_environment.rb b/Library/Homebrew/build_environment.rb index e44ff2cbde..d1b7f8b861 100644 --- a/Library/Homebrew/build_environment.rb +++ b/Library/Homebrew/build_environment.rb @@ -18,9 +18,9 @@ class BuildEnvironment self end - sig { params(o: Symbol).returns(T.self_type) } - def <<(o) - @settings << o + sig { params(option: Symbol).returns(T.self_type) } + def <<(option) + @settings << option self end diff --git a/Library/Homebrew/options.rb b/Library/Homebrew/options.rb index a6c8549459..727a72cfa5 100644 --- a/Library/Homebrew/options.rb +++ b/Library/Homebrew/options.rb @@ -139,8 +139,8 @@ class Options map(&:flag) end - def include?(o) - any? { |opt| opt == o || opt.name == o || opt.flag == o } + def include?(option) + any? { |opt| opt == option || opt.name == option || opt.flag == option } end alias to_ary to_a