Remove unused processed option element

Homebrew · Aug 19, 2024 · 7acddd7 · 7acddd7
1 parent 4bbad3c
commit 7acddd7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
@@ -11,10 +11,9 @@ class Args < OpenStruct
  # Represents a processed option. The array elements are:
  # 0: short option name (e.g. "-d")
  # 1: long option name (e.g. "--debug")
- # 2: ???
- # 3: option description (e.g. "Print debugging information")
- # 4: whether the option is hidden)
- OptionsType = T.type_alias { T::Array[[String, T.nilable(String), NilClass, String, T::Boolean]] }
+ # 2: option description (e.g. "Print debugging information")
+ # 3: whether the option is hidden
+ OptionsType = T.type_alias { T::Array[[String, T.nilable(String), String, T::Boolean]] }
  # rubocop:enable Style/MutableConstant
 
  sig { returns(T::Array[String]) }

diff --git a/Library/Homebrew/cli/parser.rb b/Library/Homebrew/cli/parser.rb
@@ -670,7 +670,7 @@ def check_named_args(args)
  def process_option(*args, type:, hidden: false)
  option, = @parser.make_switch(args)
  @processed_options.reject! { |existing| existing.second == option.long.first } if option.long.first.present?
- @processed_options << [option.short.first, option.long.first, option.arg, option.desc.first, hidden]
+ @processed_options << [option.short.first, option.long.first, option.desc.first, hidden]
 
  args.pop # last argument is the description
  if type == :switch

diff --git a/Library/Homebrew/commands.rb b/Library/Homebrew/commands.rb
@@ -199,7 +199,7 @@ def self.command_options(command)
  return if path.blank?
 
  if (cmd_parser = Homebrew::CLI::Parser.from_cmd_path(path))
- cmd_parser.processed_options.filter_map do |short, long, _, desc, hidden|
+ cmd_parser.processed_options.filter_map do |short, long, desc, hidden|
  next if hidden
 
  [long || short, desc]

diff --git a/Library/Homebrew/manpages.rb b/Library/Homebrew/manpages.rb
@@ -96,9 +96,10 @@ def self.generate_cmd_manpages(cmd_paths)
  man_page_lines.compact.join("\n")
  end
 
+ sig { params(cmd_parser: CLI::Parser).returns(T::Array[String]) }
  def self.cmd_parser_manpage_lines(cmd_parser)
  lines = [format_usage_banner(cmd_parser.usage_banner_text)]
- lines += cmd_parser.processed_options.filter_map do |short, long, _, desc, hidden|
+ lines += cmd_parser.processed_options.filter_map do |short, long, desc, hidden|
  next if hidden
 
  if long.present?