Merge pull request #5925 from MikeMcQuaid/more-deprecations

Deprecate tap pinning (and remove `odisabled`)

Library/Homebrew/brew.rb

@@ -96,8 +96,6 @@ begin
     # `Homebrew.help` never returns, except for external/unknown commands.
   end
 
-  odisabled("HOMEBREW_BUILD_FROM_SOURCE", "--build-from-source") if ENV["HOMEBREW_BUILD_FROM_SOURCE"]
-
   if internal_cmd
     Homebrew.send cmd.to_s.tr("-", "_").downcase
   elsif which "brew-#{cmd}"

Library/Homebrew/cmd/prune.rb

@@ -1,28 +0,0 @@
-require "keg"
-require "cli_parser"
-require "cleanup"
-
-module Homebrew
-  module_function
-
-  def prune_args
-    Homebrew::CLI::Parser.new do
-      usage_banner <<~EOS
-        `prune` [<options>]
-
-        Deprecated. Use `brew cleanup` instead.
-      EOS
-      switch "-n", "--dry-run",
-        description: "Show what would be removed, but do not actually remove anything."
-      switch :verbose
-      switch :debug
-      hide_from_man_page!
-    end
-  end
-
-  def prune
-    prune_args.parse
-
-    odisabled("'brew prune'", "'brew cleanup --prune-prefix'")
-  end
-end

Library/Homebrew/cmd/tap-pin.rb

@@ -12,10 +12,14 @@ module Homebrew
         by the user. See also `tap-unpin`.
       EOS
       switch :debug
+      hide_from_man_page!
     end
   end
 
   def tap_pin
+    odeprecated "brew tap-pin user/tap",
+      "fully-scoped user/tap/formula naming"
+
     tap_pin_args.parse
 
     ARGV.named.each do |name|

Library/Homebrew/cmd/tap-unpin.rb

@@ -11,10 +11,14 @@ module Homebrew
         Unpin <tap> so its formulae are no longer prioritised. See also `tap-pin`.
       EOS
       switch :debug
+      hide_from_man_page!
     end
   end
 
   def tap_unpin
+    odeprecated "brew tap-pin user/tap",
+      "fully-scoped user/tap/formula naming"
+
     tap_unpin_args.parse
 
     ARGV.named.each do |name|

Library/Homebrew/cmd/upgrade.rb

@@ -50,12 +50,6 @@ module Homebrew
   end
 
   def upgrade
-    if ARGV.include?("--cleanup")
-      odisabled("'brew upgrade --cleanup'")
-    elsif ENV["HOMEBREW_UPGRADE_CLEANUP"]
-      odisabled("'HOMEBREW_UPGRADE_CLEANUP'")
-    end
-
     upgrade_args.parse
 
     FormulaInstaller.prevent_build_flags unless DevelopmentTools.installed?

Library/Homebrew/compat.rb

@@ -1,2 +0,0 @@
-require "compat/os/mac"
-require "compat/formula"

Library/Homebrew/compat/formula.rb

@@ -1,18 +0,0 @@
-class Formula
-  module Compat
-    # Run `scons` using a Homebrew-installed version rather than whatever is
-    # in the `PATH`.
-    def scons(*)
-      odisabled("scons", 'system "scons"')
-    end
-
-    # Run `make` 3.81 or newer.
-    # Uses the system make on Leopard and newer, and the
-    # path to the actually-installed make on Tiger or older.
-    def make(*)
-      odisabled("make", 'system "make"')
-    end
-  end
-
-  prepend Compat
-end

Library/Homebrew/compat/os/mac.rb

@@ -1,14 +0,0 @@
-module OS
-  module Mac
-    class << self
-      module Compat
-        def prefer_64_bit?
-          odisabled("MacOS.prefer_64_bit?")
-          Hardware::CPU.is_64_bit?
-        end
-      end
-
-      prepend Compat
-    end
-  end
-end

Library/Homebrew/compilers.rb

@@ -16,10 +16,7 @@ class CompilerFailure
   attr_reader :name
 
   def version(val = nil)
-    if val
+    @version = Version.parse(val.to_s) if val
-      @version = Version.parse(val.to_s)
-      odisabled "'fails_with :clang' with 'build' < 600" if name.to_s == "clang" && val.to_i < 600
-    end
     @version
   end
 

Library/Homebrew/formula.rb

@@ -2496,15 +2496,10 @@ class Formula
     #   version '7.1'
     # end</pre>
     def fails_with(compiler, &block)
-      odisabled "fails_with :gcc_4_0" if compiler == :gcc_4_0
-      odisabled "fails_with :gcc_4_2" if compiler == :gcc_4_2
-      odisabled "fails_with :gcc" if compiler == :gcc && !block_given?
       specs.each { |spec| spec.fails_with(compiler, &block) }
     end
 
     def needs(*standards)
-      odisabled "needs :cxx11" if standards.include?(:cxx11)
-      odisabled "needs :cxx14" if standards.include?(:cxx14)
       specs.each { |spec| spec.needs(*standards) }
     end
 

Library/Homebrew/formulary.rb

@@ -460,9 +460,13 @@ module Formulary
     if possible_pinned_tap_formulae.size == 1
       selected_formula = factory(possible_pinned_tap_formulae.first, spec)
       if core_path(ref).file?
+        odeprecated "brew tap-pin user/tap",
+          "fully-scoped user/tap/formula naming"
         opoo <<~EOS
           #{ref} is provided by core, but is now shadowed by #{selected_formula.full_name}.
+          This behaviour is deprecated and will be removed in Homebrew 2.2.0.
           To refer to the core formula, use Homebrew/core/#{ref} instead.
+          To refer to the tap formula, use #{selected_formula.full_name} instead.
         EOS
       end
       selected_formula

Library/Homebrew/software_spec.rb

@@ -206,15 +206,10 @@ class SoftwareSpec
   end
 
   def fails_with(compiler, &block)
-    odisabled "fails_with :gcc_4_0" if compiler == :gcc_4_0
-    odisabled "fails_with :gcc_4_2" if compiler == :gcc_4_2
-    odisabled "fails_with :gcc" if compiler == :gcc && !block_given?
     compiler_failures << CompilerFailure.create(compiler, &block)
   end
 
   def needs(*standards)
-    odisabled "needs :cxx11" if standards.include?(:cxx11)
-    odisabled "needs :cxx14" if standards.include?(:cxx14)
     standards.each do |standard|
       compiler_failures.concat CompilerFailure.for_standard(standard)
     end

docs/Manpage.md

@@ -488,15 +488,6 @@ summary of all installed taps if no *`tap`* are passed.
 * `--json`:
   Print a JSON representation of *`taps`*. Currently the default and only accepted value for *`version`* is `v1`. See the docs for examples of using the JSON output: <https://docs.brew.sh/Querying-Brew>
 
-### `tap-pin` *`tap`*
-
-Pin *`tap`*, prioritising its formulae over core when formula names are supplied
-by the user. See also `tap-unpin`.
-
-### `tap-unpin` *`tap`*
-
-Unpin *`tap`* so its formulae are no longer prioritised. See also `tap-pin`.
-
 ### `uninstall`, `rm`, `remove` [*`options`*] *`formula`*
 
 Uninstall *`formula`*.

manpages/brew.1

@@ -612,12 +612,6 @@ Display information on all installed taps\.
 \fB\-\-json\fR
 Print a JSON representation of \fItaps\fR\. Currently the default and only accepted value for \fIversion\fR is \fBv1\fR\. See the docs for examples of using the JSON output: \fIhttps://docs\.brew\.sh/Querying\-Brew\fR
 .
-.SS "\fBtap\-pin\fR \fItap\fR"
-Pin \fItap\fR, prioritising its formulae over core when formula names are supplied by the user\. See also \fBtap\-unpin\fR\.
-.
-.SS "\fBtap\-unpin\fR \fItap\fR"
-Unpin \fItap\fR so its formulae are no longer prioritised\. See also \fBtap\-pin\fR\.
-.
 .SS "\fBuninstall\fR, \fBrm\fR, \fBremove\fR [\fIoptions\fR] \fIformula\fR"
 Uninstall \fIformula\fR\.
 .