move cask/cmd/uninstall to cask/uninstall

Library/Homebrew/cask/cmd.rb

@@ -14,7 +14,6 @@ require "cask/cmd/audit"
 require "cask/cmd/fetch"
 require "cask/cmd/install"
 require "cask/cmd/reinstall"
-require "cask/cmd/uninstall"
 require "cask/cmd/upgrade"
 
 module Cask

Library/Homebrew/cask/cmd/uninstall.rb

@@ -1,56 +0,0 @@
-# typed: false
-# frozen_string_literal: true
-
-module Cask
-  class Cmd
-    # Cask implementation of the `brew uninstall` command.
-    #
-    # @api private
-    class Uninstall < AbstractCommand
-      extend T::Sig
-
-      def self.parser
-        super do
-          switch "--force",
-                 description: "Uninstall even if the <cask> is not installed, overwrite " \
-                              "existing files and ignore errors when removing files."
-        end
-      end
-
-      sig { void }
-      def run
-        self.class.uninstall_casks(
-          *casks,
-          binaries: args.binaries?,
-          verbose:  args.verbose?,
-          force:    args.force?,
-        )
-      end
-
-      def self.uninstall_casks(*casks, binaries: nil, force: false, verbose: false)
-        require "cask/installer"
-
-        options = {
-          binaries: binaries,
-          force:    force,
-          verbose:  verbose,
-        }.compact
-
-        casks.each do |cask|
-          odebug "Uninstalling Cask #{cask}"
-
-          raise CaskNotInstalledError, cask if !cask.installed? && !force
-
-          Installer.new(cask, **options).uninstall
-
-          next if (versions = cask.versions).empty?
-
-          puts <<~EOS
-            #{cask} #{versions.to_sentence} #{(versions.count == 1) ? "is" : "are"} still installed.
-            Remove #{(versions.count == 1) ? "it" : "them all"} with `brew uninstall --cask --force #{cask}`.
-          EOS
-        end
-      end
-    end
-  end
-end

Library/Homebrew/cask/uninstall.rb

@@ -0,0 +1,33 @@
+# typed: false
+# frozen_string_literal: true
+
+module Cask
+  # @api private
+  class Uninstall
+
+    def self.uninstall_casks(*casks, binaries: nil, force: false, verbose: false)
+      require "cask/installer"
+
+      options = {
+        binaries: binaries,
+        force:    force,
+        verbose:  verbose,
+      }.compact
+
+      casks.each do |cask|
+        odebug "Uninstalling Cask #{cask}"
+
+        raise CaskNotInstalledError, cask if !cask.installed? && !force
+
+        Installer.new(cask, **options).uninstall
+
+        next if (versions = cask.versions).empty?
+
+        puts <<~EOS
+          #{cask} #{versions.to_sentence} #{(versions.count == 1) ? "is" : "are"} still installed.
+          Remove #{(versions.count == 1) ? "it" : "them all"} with `brew uninstall --cask --force #{cask}`.
+        EOS
+      end
+    end
+  end
+end

Library/Homebrew/cmd/uninstall.rb

@@ -6,10 +6,10 @@ require "formula"
 require "diagnostic"
 require "migrator"
 require "cli/parser"
-require "cask/cmd"
 require "cask/cask_loader"
 require "cask/exceptions"
 require "cask/installer"
+require "cask/uninstall"
 require "uninstall"
 
 module Homebrew
@@ -76,7 +76,7 @@ module Homebrew
         Cask::Installer.new(cask, verbose: args.verbose?, force: args.force?).zap
       end
     else
-      T.unsafe(Cask::Cmd::Uninstall).uninstall_casks(
+      Cask::Uninstall.uninstall_casks(
         *casks,
         verbose: args.verbose?,
         force:   args.force?,