From 68dbf12220f9a52ddf5ca5eb3aa1b356aa42da3a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 23 Jun 2025 13:52:35 +0100 Subject: [PATCH] Revert "Make some of the `bundle` commands Sorbet `typed: true`" --- Library/Homebrew/bundle/brew_dumper.rb | 11 +++-------- Library/Homebrew/bundle/checker.rb | 6 +++--- .../sorbet/rbi/dsl/homebrew/bundle/brew_dumper.rbi | 5 ----- 3 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 Library/Homebrew/sorbet/rbi/dsl/homebrew/bundle/brew_dumper.rbi diff --git a/Library/Homebrew/bundle/brew_dumper.rb b/Library/Homebrew/bundle/brew_dumper.rb index 67c5a6c6a2..403c92eec6 100644 --- a/Library/Homebrew/bundle/brew_dumper.rb +++ b/Library/Homebrew/bundle/brew_dumper.rb @@ -1,4 +1,4 @@ -# typed: true +# typed: false # rubocop:todo Sorbet/TrueSigil # frozen_string_literal: true require "json" @@ -189,12 +189,7 @@ module Homebrew class Topo < Hash include TSort - - def each_key(&block) - keys.each(&block) - end alias tsort_each_node each_key - def tsort_each_child(node, &block) fetch(node.downcase).sort.each(&block) end @@ -235,8 +230,8 @@ module Homebrew odie <<~EOS Formulae dependency graph sorting failed (likely due to a circular dependency): - #{cycle_first}: #{topo[cycle_first] if topo} - #{cycle_last}: #{topo[cycle_last] if topo} + #{cycle_first}: #{topo[cycle_first]} + #{cycle_last}: #{topo[cycle_last]} Please run the following commands and try again: brew update brew uninstall --ignore-dependencies --force #{cycle_first} #{cycle_last} diff --git a/Library/Homebrew/bundle/checker.rb b/Library/Homebrew/bundle/checker.rb index 3d8959ffdf..411e0d8c0b 100644 --- a/Library/Homebrew/bundle/checker.rb +++ b/Library/Homebrew/bundle/checker.rb @@ -1,4 +1,4 @@ -# typed: true +# typed: false # rubocop:todo Sorbet/TrueSigil # frozen_string_literal: true module Homebrew @@ -23,7 +23,7 @@ module Homebrew else "needs to be installed or updated." end - "#{self.class.const_get(:PACKAGE_TYPE_NAME)} #{name} #{reason}" + "#{self.class::PACKAGE_TYPE_NAME} #{name} #{reason}" end def full_check(packages, no_upgrade:) @@ -33,7 +33,7 @@ module Homebrew def checkable_entries(all_entries) require "bundle/skipper" - all_entries.select { |e| e.type == self.class.const_get(:PACKAGE_TYPE) } + all_entries.select { |e| e.type == self.class::PACKAGE_TYPE } .reject(&Bundle::Skipper.method(:skip?)) end diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/bundle/brew_dumper.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/bundle/brew_dumper.rbi deleted file mode 100644 index f747988811..0000000000 --- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/bundle/brew_dumper.rbi +++ /dev/null @@ -1,5 +0,0 @@ -# typed: true - -module Homebrew::Bundle::BrewDumper - include Kernel -end