From 24eb8e8e54ec7f44c2aa6ca55af6f0ac8fe35390 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 29 Jan 2019 08:31:45 +0000
Subject: [PATCH] Remove (now) unused invalid_option_names.

This is handled by `OptionParser` now instead in `cmd/install`.
---
 Library/Homebrew/build_options.rb           | 16 ----------------
 Library/Homebrew/cmd/install.rb             |  1 -
 Library/Homebrew/formula_installer.rb       |  7 +------
 Library/Homebrew/reinstall.rb               |  1 -
 Library/Homebrew/test/build_options_spec.rb | 13 -------------
 5 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/Library/Homebrew/build_options.rb b/Library/Homebrew/build_options.rb
index 331a624e68..bc7b278a67 100644
--- a/Library/Homebrew/build_options.rb
+++ b/Library/Homebrew/build_options.rb
@@ -99,22 +99,6 @@ class BuildOptions
     @options - @args
   end
 
-  # @private
-  def invalid_options
-    @args - @options - BuildOptions.formula_install_options
-  end
-
-  # @private
-  def invalid_option_names
-    invalid_options.map(&:flag).sort
-  end
-
-  def self.formula_install_options
-    @formula_install_options ||= ARGV.formula_install_option_names.map do |option_name|
-      Option.new option_name[2..-1]
-    end
-  end
-
   private
 
   def option_defined?(name)
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index aed12ec825..308362701d 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -390,7 +390,6 @@ module Homebrew
 
     fi = FormulaInstaller.new(f)
     fi.options              = build_options.used_options
-    fi.invalid_option_names = build_options.invalid_option_names
     fi.ignore_deps          = args.ignore_dependencies?
     fi.only_deps            = args.only_dependencies?
     fi.build_bottle         = args.build_bottle?
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index ba0fd8bb34..4ff9e5bd57 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -33,7 +33,7 @@ class FormulaInstaller
   end
 
   attr_reader :formula
-  attr_accessor :options, :build_bottle, :invalid_option_names
+  attr_accessor :options, :build_bottle
   attr_accessor :installed_as_dependency, :installed_on_request, :link_keg
   mode_attr_accessor :show_summary_heading, :show_header
   mode_attr_accessor :build_from_source, :force_bottle, :include_test
@@ -58,7 +58,6 @@ class FormulaInstaller
     @installed_as_dependency = false
     @installed_on_request = true
     @options = Options.new
-    @invalid_option_names = []
     @requirement_messages = []
     @poured_bottle = false
     @pour_failed = false
@@ -267,10 +266,6 @@ class FormulaInstaller
       opoo "#{formula.full_name}: #{old_flag} was deprecated; using #{new_flag} instead!"
     end
 
-    invalid_option_names.each do |option|
-      opoo "#{formula.full_name}: this formula has no #{option} option so it will be ignored!"
-    end
-
     options = display_options(formula)
     if show_header?
       oh1 "Installing #{Formatter.identifier(formula.full_name)} #{options}".strip
diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb
index 98bdd0b137..fd131e84cc 100644
--- a/Library/Homebrew/reinstall.rb
+++ b/Library/Homebrew/reinstall.rb
@@ -20,7 +20,6 @@ module Homebrew
 
     fi = FormulaInstaller.new(f)
     fi.options              = options
-    fi.invalid_option_names = build_options.invalid_option_names
     fi.build_bottle         = ARGV.build_bottle? || (!f.bottle_defined? && f.build.bottle?)
     fi.interactive          = ARGV.interactive?
     fi.git                  = ARGV.git?
diff --git a/Library/Homebrew/test/build_options_spec.rb b/Library/Homebrew/test/build_options_spec.rb
index 8c118c5515..8c60e128ec 100644
--- a/Library/Homebrew/test/build_options_spec.rb
+++ b/Library/Homebrew/test/build_options_spec.rb
@@ -37,17 +37,4 @@ describe BuildOptions do
   specify "#unused_options" do
     expect(subject.unused_options).to include("--without-baz")
   end
-
-  specify "#invalid_options" do
-    expect(subject.invalid_options).to be_empty
-    expect(bad_build.invalid_options).to include("--without-bas")
-    expect(bad_build.invalid_options).to include("--without-abc")
-    expect(bad_build.invalid_options).not_to include("--with-foo")
-    expect(bad_build.invalid_options).not_to include("--with-baz")
-  end
-
-  specify "#invalid_option_names" do
-    expect(subject.invalid_option_names).to be_empty
-    expect(bad_build.invalid_option_names).to eq(%w[--without-abc --without-bas])
-  end
 end