mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20158 from Homebrew/revert-20145-some-bundle-files-werent-typed-at-all-but-now-some-are

Browse Source 
Revert "Make some of the `bundle` commands Sorbet `typed: true`"
This commit is contained in:
Mike McQuaid 2025-06-23 13:04:48 +00:00 committed by GitHub
commit c19f08b3e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/bundle/brew_dumper.rb
View File

@ -1,4 +1,4 @@
# typed: true # typed: false # rubocop:todo Sorbet/TrueSigil
# frozen_string_literal: true # frozen_string_literal: true
require "json" require "json"
@ -189,12 +189,7 @@ module Homebrew
class Topo < Hash class Topo < Hash
include TSort include TSort
def each_key(&block)
keys.each(&block)
end
alias tsort_each_node each_key alias tsort_each_node each_key
def tsort_each_child(node, &block) def tsort_each_child(node, &block)
fetch(node.downcase).sort.each(&block) fetch(node.downcase).sort.each(&block)
end end
@ -235,8 +230,8 @@ module Homebrew
odie <<~EOS odie <<~EOS
Formulae dependency graph sorting failed (likely due to a circular dependency): Formulae dependency graph sorting failed (likely due to a circular dependency):
#{cycle_first}: #{topo[cycle_first] if topo} #{cycle_first}: #{topo[cycle_first]}
#{cycle_last}: #{topo[cycle_last] if topo} #{cycle_last}: #{topo[cycle_last]}
Please run the following commands and try again: Please run the following commands and try again:
brew update brew update
brew uninstall --ignore-dependencies --force #{cycle_first} #{cycle_last} brew uninstall --ignore-dependencies --force #{cycle_first} #{cycle_last}

6
Library/Homebrew/bundle/checker.rb
View File

@ -1,4 +1,4 @@
# typed: true # typed: false # rubocop:todo Sorbet/TrueSigil
# frozen_string_literal: true # frozen_string_literal: true
module Homebrew module Homebrew
@ -23,7 +23,7 @@ module Homebrew
else else
"needs to be installed or updated." "needs to be installed or updated."
end end
"#{self.class.const_get(:PACKAGE_TYPE_NAME)} #{name} #{reason}" "#{self.class::PACKAGE_TYPE_NAME} #{name} #{reason}"
end end
def full_check(packages, no_upgrade:) def full_check(packages, no_upgrade:)
@ -33,7 +33,7 @@ module Homebrew
def checkable_entries(all_entries) def checkable_entries(all_entries)
require "bundle/skipper" 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?)) .reject(&Bundle::Skipper.method(:skip?))
end end

5
Library/Homebrew/sorbet/rbi/dsl/homebrew/bundle/brew_dumper.rbi
View File

@ -1,5 +0,0 @@
# typed: true
module Homebrew::Bundle::BrewDumper
include Kernel
end