Merge pull request #21181 from Homebrew/option-symbols-cleanup

MikeMcQuaid · web-flow · commit 6664aa547b02 · 2025-12-06T10:30:17.000Z
Deprecate `option :cxx11` and `option :universal`
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
@@ -4140,11 +4140,6 @@ def uses_from_macos(dep, bounds = {})
     # Note that for {.depends_on} that are `:optional` or `:recommended`, options
     # are generated automatically.
     #
-    # There are also some special options:
-    #
-    # - `:universal`: build a universal binary/library (e.g. on newer Intel Macs
-    #   this means a combined x86_64/x86 binary/library).
-    #
     # ### Examples
     #
     # ```ruby
@@ -4155,14 +4150,15 @@ def uses_from_macos(dep, bounds = {})
     # option "with-qt", "Text here overwrites what's autogenerated by 'depends_on "qt" => :optional'"
     # ```
     #
-    # ```ruby
-    # option :universal
-    # ```
-    #
     # @api public
-    sig { params(name: String, description: String).void }
+    sig { params(name: T.any(String, Symbol), description: String).void }
     def option(name, description = "")
-      specs.each { |spec| spec.option(name, description) }
+      case name
+      when Symbol
+        odeprecated "`option :#{name}`"
+      else
+        specs.each { |spec| spec.option(name, description) }
+      end
     end
 
     # Deprecated options are used to rename options and migrate users who used
diff --git a/Library/Homebrew/rubocops/lines.rb b/Library/Homebrew/rubocops/lines.rb
@@ -830,18 +830,6 @@ def audit_formula(formula_nodes)
             problem "Define method `#{method_name(@offensive_node)}` in the class body, not at the top-level"
           end
 
-          find_instance_method_call(body_node, :build, :universal?) do
-            next if @formula_name == "wine"
-
-            problem "macOS has been 64-bit only since 10.6 so build.universal? is deprecated."
-          end
-
-          find_instance_method_call(body_node, "ENV", :universal_binary) do
-            next if @formula_name == "wine"
-
-            problem "macOS has been 64-bit only since 10.6 so ENV.universal_binary is deprecated."
-          end
-
           find_instance_method_call(body_node, "ENV", :runtime_cpu_detection) do
             next if tap_style_exception? :runtime_cpu_detection_allowlist
 
diff --git a/Library/Homebrew/rubocops/options.rb b/Library/Homebrew/rubocops/options.rb
@@ -8,9 +8,6 @@ module Cop
     module FormulaAudit
       # This cop audits `option`s in formulae.
       class Options < FormulaCop
-        DEPRECATION_MSG = "macOS has been 64-bit only since 10.6 so 32-bit options are deprecated."
-        UNI_DEPRECATION_MSG = "macOS has been 64-bit only since 10.6 so universal options are deprecated."
-
         DEP_OPTION = "Formulae in homebrew/core should not use `deprecated_option`."
         OPTION = "Formulae in homebrew/core should not use `option`."
 
@@ -21,15 +18,10 @@ def audit_formula(formula_nodes)
           option_call_nodes = find_every_method_call_by_name(body_node, :option)
           option_call_nodes.each do |option_call|
             option = parameters(option_call).first
-            problem DEPRECATION_MSG if regex_match_group(option, /32-bit/)
-
             offending_node(option_call)
             option = string_content(option)
-            problem UNI_DEPRECATION_MSG if option == "universal"
 
-            if !/with(out)?-/.match?(option) &&
-               option != "cxx11" &&
-               option != "universal"
+            unless /with(out)?-/.match?(option)
               problem "Options should begin with `with` or `without`. " \
                       "Migrate '--#{option}' with `deprecated_option`."
             end
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
@@ -20,11 +20,6 @@ class SoftwareSpec
   extend Forwardable
   include OnSystem::MacOSAndLinux
 
-  PREDEFINED_OPTIONS = T.let({
-    universal: Option.new("universal", "Build a universal binary"),
-    cxx11:     Option.new("c++11",     "Build using C++11 mode"),
-  }.freeze, T::Hash[T.any(Symbol, String), Option])
-
   sig { returns(T.nilable(String)) }
   attr_reader :name
 
@@ -207,16 +202,13 @@ def option_defined?(name)
     options.include?(name)
   end
 
-  sig { params(name: T.any(Symbol, String), description: String).void }
+  sig { params(name: String, description: String).void }
   def option(name, description = "")
-    opt = PREDEFINED_OPTIONS.fetch(name) do
-      raise ArgumentError, "option name is required" if name.empty?
-      raise ArgumentError, "option name must be longer than one character: #{name}" if name.length <= 1
-      raise ArgumentError, "option name must not start with dashes: #{name}" if name.start_with?("-")
+    raise ArgumentError, "option name is required" if name.empty?
+    raise ArgumentError, "option name must be longer than one character: #{name}" if name.length <= 1
+    raise ArgumentError, "option name must not start with dashes: #{name}" if name.start_with?("-")
 
-      Option.new(name, description)
-    end
-    options << opt
+    options << Option.new(name, description)
   end
 
   sig { params(hash: T::Hash[T.any(String, Symbol, T::Array[String]), T.any(String, Symbol, T::Array[String])]).void }
diff --git a/Library/Homebrew/test/rubocops/options_spec.rb b/Library/Homebrew/test/rubocops/options_spec.rb
@@ -6,31 +6,10 @@
   subject(:cop) { described_class.new }
 
   context "when auditing options" do
-    it "reports an offense when using the 32-bit option" do
-      expect_offense(<<~RUBY)
-        class Foo < Formula
-          url 'https://brew.sh/foo-1.0.tgz'
-          option "with-32-bit"
-                 ^^^^^^^^^^^^^ FormulaAudit/Options: macOS has been 64-bit only since 10.6 so 32-bit options are deprecated.
-        end
-      RUBY
-    end
-
-    it "reports an offense when using `:universal`" do
-      expect_offense(<<~RUBY)
-        class Foo < Formula
-          url 'https://brew.sh/foo-1.0.tgz'
-          option :universal
-          ^^^^^^^^^^^^^^^^^ FormulaAudit/Options: macOS has been 64-bit only since 10.6 so universal options are deprecated.
-        end
-      RUBY
-    end
-
     it "reports an offense when using bad option names" do
       expect_offense(<<~RUBY)
         class Foo < Formula
           url 'https://brew.sh/foo-1.0.tgz'
-          option :cxx11
           option "examples", "with-examples"
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FormulaAudit/Options: Options should begin with `with` or `without`. Migrate '--examples' with `deprecated_option`.
         end
diff --git a/Library/Homebrew/test/rubocops/text/miscellaneous_spec.rb b/Library/Homebrew/test/rubocops/text/miscellaneous_spec.rb
@@ -86,56 +86,6 @@ class Foo < Formula
       RUBY
     end
 
-    it "reports an offense when `build.universal?` is used" do
-      expect_offense(<<~RUBY)
-        class Foo < Formula
-          desc "foo"
-          url 'https://brew.sh/foo-1.0.tgz'
-          if build.universal?
-             ^^^^^^^^^^^^^^^^ FormulaAudit/Miscellaneous: macOS has been 64-bit only since 10.6 so build.universal? is deprecated.
-             "foo"
-          end
-        end
-      RUBY
-    end
-
-    it "reports no offenses when `build.universal?` is used in an exempt formula" do
-      expect_no_offenses(<<~RUBY, "/homebrew-core/Formula/wine.rb")
-        class Wine < Formula
-          desc "foo"
-          url 'https://brew.sh/foo-1.0.tgz'
-          if build.universal?
-             "foo"
-          end
-        end
-      RUBY
-    end
-
-    it "reports an offense when `ENV.universal_binary` is used" do
-      expect_offense(<<~RUBY)
-        class Foo < Formula
-          desc "foo"
-          url 'https://brew.sh/foo-1.0.tgz'
-          if build?
-             ENV.universal_binary
-             ^^^^^^^^^^^^^^^^^^^^ FormulaAudit/Miscellaneous: macOS has been 64-bit only since 10.6 so ENV.universal_binary is deprecated.
-          end
-        end
-      RUBY
-    end
-
-    it "reports no offenses when `ENV.universal_binary` is used in an exempt formula" do
-      expect_no_offenses(<<~RUBY, "/homebrew-core/Formula/wine.rb")
-        class Wine < Formula
-          desc "foo"
-          url 'https://brew.sh/foo-1.0.tgz'
-          if build?
-            ENV.universal_binary
-          end
-        end
-      RUBY
-    end
-
     it "reports an offense when `install_name_tool` is called" do
       expect_offense(<<~RUBY)
         class Foo < Formula
diff --git a/Library/Homebrew/test/software_spec_spec.rb b/Library/Homebrew/test/software_spec_spec.rb
@@ -77,12 +77,6 @@
       end.to raise_error(ArgumentError)
     end
 
-    it "special cases the cxx11 option" do
-      spec.option(:cxx11)
-      expect(spec).to have_defined_option("c++11")
-      expect(spec).not_to have_defined_option("cxx11")
-    end
-
     it "supports options with descriptions" do
       spec.option("bar", "description")
       expect(spec.options.first.description).to eq("description")
