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, 5 insertions, 8 deletions

diff --git a/Library/Homebrew/compat/utils.rb b/Library/Homebrew/compat/utils.rb
index 8904f0f2b..f83d07599 100644
--- a/Library/Homebrew/compat/utils.rb
+++ b/Library/Homebrew/compat/utils.rb
@@ -2,17 +2,14 @@ module Tty
   module_function
 
   def white
-    odeprecated "Tty.white", "Tty.reset.bold"
-    reset.bold
+    odisabled "Tty.white", "Tty.reset.bold"
   end
 end
 
-def puts_columns(items)
-  odeprecated "puts_columns", "puts Formatter.columns"
-  puts Formatter.columns(items)
+def puts_columns(_)
+  odisabled "puts_columns", "puts Formatter.columns"
 end
 
-def plural(n, s = "s")
-  odeprecated "#plural", "Formatter.pluralize"
-  (n == 1) ? "" : s
+def plural(_, _)
+  odisabled "#plural", "Formatter.pluralize"
 end