Limit exposure of the options data structures

5 files changed, 5 insertions, 7 deletions

diff --git a/Library/Formula/coq.rb b/Library/Formula/coq.rb
index 55c593153..7bd6cac90 100644
--- a/Library/Formula/coq.rb
+++ b/Library/Formula/coq.rb
@@ -3,9 +3,7 @@ require "formula"
 class TransitionalMode < Requirement
   fatal true
 
-  satisfy do
-    Tab.for_name("camlp5").unused_options.include? "strict"
-  end
+  satisfy { !Tab.for_name("camlp5").include?("strict") }
 
   def message; <<-EOS.undent
     camlp5 must be compiled in transitional mode (instead of --strict mode):
diff --git a/Library/Formula/mutt.rb b/Library/Formula/mutt.rb
index 86852ad31..ef81cb2e8 100644
--- a/Library/Formula/mutt.rb
+++ b/Library/Formula/mutt.rb
@@ -28,7 +28,7 @@ class Mutt < Formula
     end
   end
 
-  unless Tab.for_name("signing-party").used_options.include? "with-rename-pgpring"
+  unless Tab.for_name("signing-party").with? "rename-pgpring"
     conflicts_with "signing-party",
       :because => "mutt installs a private copy of pgpring"
   end
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 82bd874fb..68fde9802 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -24,7 +24,7 @@ class Python < Formula
   depends_on "gdbm" => :recommended
   depends_on "openssl"
   depends_on "homebrew/dupes/tcl-tk" if build.with? "brewed-tk"
-  depends_on :x11 if build.with? "brewed-tk" and Tab.for_name("tcl-tk").used_options.include?("with-x11")
+  depends_on :x11 if build.with? "brewed-tk" and Tab.for_name("tcl-tk").with? "x11"
 
   skip_clean "bin/pip", "bin/pip-2.7"
   skip_clean "bin/easy_install", "bin/easy_install-2.7"
diff --git a/Library/Formula/python3.rb b/Library/Formula/python3.rb
index f30972893..2bc408d77 100644
--- a/Library/Formula/python3.rb
+++ b/Library/Formula/python3.rb
@@ -26,7 +26,7 @@ class Python3 < Formula
   depends_on 'openssl'
   depends_on 'xz' => :recommended  # for the lzma module added in 3.3
   depends_on 'homebrew/dupes/tcl-tk' if build.with? 'brewed-tk'
-  depends_on :x11 if build.with? 'brewed-tk' and Tab.for_name('tcl-tk').used_options.include?('with-x11')
+  depends_on :x11 if build.with? "brewed-tk" and Tab.for_name("tcl-tk").with? "x11"
 
   skip_clean "bin/pip3", "bin/pip-#{VER}"
   skip_clean "bin/easy_install3", "bin/easy_install-#{VER}"
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 150146329..5070356e4 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -1006,7 +1006,7 @@ def check_for_non_prefixed_coreutils
 end
 
 def check_for_non_prefixed_findutils
-  default_names = Tab.for_name('findutils').used_options.include? 'default-names'
+  default_names = Tab.for_name('findutils').include? 'default-names'
   if default_names then <<-EOS.undent
     Putting non-prefixed findutils in your path can cause python builds to fail.
     EOS