Merge pull request #17625 from Homebrew/more-sorbet-strict-devcmd

sorbet: Tighten up `dev-cmd` types
This commit is contained in:
Issy Long 2024-07-04 13:55:55 +01:00 committed by GitHub
commit e1fe3e2311
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 12 deletions

View File

@ -495,7 +495,7 @@ module Homebrew
check_closed_pull_requests(formula, tap_remote_repo, version:)
end
sig { params(formula: Formula, new_version: String).returns(NilClass) }
sig { params(formula: Formula, new_version: String).void }
def check_throttle(formula, new_version)
tap = formula.tap
return if tap.nil?

View File

@ -314,7 +314,7 @@ module Homebrew
sig {
params(
formula_or_cask: T.any(Formula, Cask::Cask),
repositories: T::Array[T.untyped],
repositories: T::Array[String],
name: String,
).returns(VersionBumpInfo)
}
@ -425,7 +425,7 @@ module Homebrew
params(
formula_or_cask: T.any(Formula, Cask::Cask),
name: String,
repositories: T::Array[T.untyped],
repositories: T::Array[String],
ambiguous_cask: T::Boolean,
).void
}

View File

@ -164,7 +164,9 @@ module Homebrew
T.let(formula_installs, T.nilable(T::Hash[Symbol, Integer]))]
end
sig { params(all_formulae: T.untyped).returns([T::Hash[String, T.untyped], T::Hash[String, T.untyped]]) }
sig {
params(all_formulae: T::Array[Formula]).returns([T::Hash[String, T.untyped], T::Hash[String, T.untyped]])
}
def deps_uses_from_formulae(all_formulae)
ohai "Populating dependency tree..."
@ -186,7 +188,7 @@ module Homebrew
[deps_hash, uses_hash]
end
sig { params(formulae: T::Array[Formula]).returns(NilClass) }
sig { params(formulae: T::Array[Formula]).void }
def output_total(formulae)
return unless @bottle_tag
@ -205,7 +207,7 @@ module Homebrew
sig {
params(formulae: T::Array[Formula], deps_hash: T::Hash[T.any(Symbol, String), T.untyped],
noun: T.nilable(String), hash: T::Hash[T.any(Symbol, String), T.untyped],
any_named_args: T::Boolean).returns(NilClass)
any_named_args: T::Boolean).void
}
def output_unbottled(formulae, deps_hash, noun, hash, any_named_args)
return unless @bottle_tag
@ -279,7 +281,7 @@ module Homebrew
puts "No unbottled dependencies found!"
end
sig { returns(NilClass) }
sig { void }
def output_lost_bottles
ohai ":#{@bottle_tag} lost bottles"

View File

@ -25,8 +25,7 @@ module Homebrew
def run
named_sponsors = []
logo_sponsors = []
# FIXME: This T.let should be unnecessary https://github.com/sorbet/sorbet/issues/6894
largest_monthly_amount = T.let(0, T.untyped)
largest_monthly_amount = T.let(0, Integer)
GitHub.sponsorships("Homebrew").each do |s|
largest_monthly_amount = [s[:monthly_amount], s[:closest_tier_monthly_amount]].max
@ -62,17 +61,17 @@ module Homebrew
private
sig { params(sponsor: T::Hash[Symbol, T.untyped]).returns(T.nilable(String)) }
sig { params(sponsor: T::Hash[Symbol, String]).returns(T.nilable(String)) }
def sponsor_name(sponsor)
sponsor[:name] || sponsor[:login]
end
sig { params(sponsor: T::Hash[Symbol, T.untyped]).returns(String) }
sig { params(sponsor: T::Hash[Symbol, String]).returns(String) }
def sponsor_logo(sponsor)
"https://github.com/#{sponsor[:login]}.png?size=64"
end
sig { params(sponsor: T::Hash[Symbol, T.untyped]).returns(String) }
sig { params(sponsor: T::Hash[Symbol, String]).returns(String) }
def sponsor_url(sponsor)
"https://github.com/#{sponsor[:login]}"
end