Add more deprecations, disable some existing ones.

Add more `odeprecated` calls to places that have been deprecated for a
while in the wild and move some of the existing `odeprecated` calls to
be `odisabled` to allow deleting the compatibility code.

1 files changed, 6 insertions, 24 deletions

diff --git a/Library/Homebrew/compat/json.rb b/Library/Homebrew/compat/json.rb
index c8bf1c292..18763b8a6 100644
--- a/Library/Homebrew/compat/json.rb
+++ b/Library/Homebrew/compat/json.rb
@@ -4,34 +4,16 @@ module Utils
   module JSON
     module_function
 
-    Error = Class.new(StandardError)
-
-    def load(str)
-      odeprecated "Utils::JSON.load", "JSON.parse"
-      ::JSON.parse(str)
-    rescue ::JSON::ParserError => e
-      raise Error, e.message
+    def load(_)
+      odisabled "Utils::JSON.load", "JSON.parse"
     end
 
-    def dump(obj)
-      odeprecated "Utils::JSON.dump", "JSON.generate"
-      ::JSON.generate(obj)
+    def dump(_)
+      odisabled "Utils::JSON.dump", "JSON.generate"
     end
 
-    def stringify_keys(obj)
-      odeprecated "Utils::JSON.stringify_keys"
-      case obj
-      when Array
-        obj.map { |val| stringify_keys(val) }
-      when Hash
-        obj.inject({}) do |result, (key, val)|
-          key = key.respond_to?(:to_s) ? key.to_s : key
-          val = stringify_keys(val)
-          result.merge!(key => val)
-        end
-      else
-        obj
-      end
+    def stringify_keys(_)
+      odisabled "Utils::JSON.stringify_keys"
     end
   end
 end