From fab1009c00c7fd88d790e098d244d579db2ddedc Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 6 Aug 2020 11:09:20 +0100
Subject: [PATCH] Revert "Deprecate global `Homebrew.args`."

---
 Library/Homebrew/compat.rb                    |  2 --
 Library/Homebrew/compat/cli/parser.rb         | 32 -------------------
 .../Homebrew/compat/dependencies_helpers.rb   | 17 ----------
 3 files changed, 51 deletions(-)
 delete mode 100644 Library/Homebrew/compat/cli/parser.rb
 delete mode 100644 Library/Homebrew/compat/dependencies_helpers.rb

diff --git a/Library/Homebrew/compat.rb b/Library/Homebrew/compat.rb
index d14810694a..bc254d9e1c 100644
--- a/Library/Homebrew/compat.rb
+++ b/Library/Homebrew/compat.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "compat/dependencies_helpers"
-require "compat/cli/parser"
 require "compat/extend/nil"
 require "compat/extend/string"
 require "compat/formula"
diff --git a/Library/Homebrew/compat/cli/parser.rb b/Library/Homebrew/compat/cli/parser.rb
deleted file mode 100644
index fccec61a62..0000000000
--- a/Library/Homebrew/compat/cli/parser.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Homebrew
-  module CLI
-    class Parser
-      module Compat
-        module DeprecatedArgs
-          def respond_to_missing?(*)
-            super
-          end
-
-          def method_missing(method, *)
-            if ![:debug?, :quiet?, :verbose?].include?(method) && !@printed_args_warning
-              odeprecated "Homebrew.args", "`args = <command>_args.parse` and pass `args` along the call chain"
-              @printed_args_warning = true
-            end
-
-            super
-          end
-        end
-
-        def parse(*)
-          args = super
-          Homebrew.args = args.dup.extend(DeprecatedArgs)
-          args
-        end
-      end
-
-      prepend Compat
-    end
-  end
-end
diff --git a/Library/Homebrew/compat/dependencies_helpers.rb b/Library/Homebrew/compat/dependencies_helpers.rb
deleted file mode 100644
index 095c891011..0000000000
--- a/Library/Homebrew/compat/dependencies_helpers.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "cli/args"
-
-module DependenciesHelpers
-  module Compat
-    def argv_includes_ignores(argv = nil)
-      unless @printed_includes_ignores_warning
-        odeprecated "Homebrew.argv_includes_ignores", "Homebrew.args_includes_ignores"
-        @printed_includes_ignores_warning = true
-      end
-      args_includes_ignores(argv ? Homebrew::CLI::Args.new : Homebrew.args)
-    end
-  end
-
-  prepend Compat
-end