Skip to content

Commit

Permalink
Merge pull request #17198 from Homebrew/dependabot/bundler/Library/Ho…
Browse files Browse the repository at this point in the history
…mebrew/multi-641a1bfb3c
  • Loading branch information
p-linnane authored May 1, 2024
2 parents 2bc90de + df2d720 commit 542edec
Show file tree
Hide file tree
Showing 90 changed files with 19 additions and 48 deletions.
18 changes: 9 additions & 9 deletions Library/Homebrew/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@ GEM
simplecov_json_formatter (0.1.4)
simpleidn (0.2.2)
unf (~> 0.1.4)
sorbet (0.5.11361)
sorbet-static (= 0.5.11361)
sorbet-runtime (0.5.11361)
sorbet-static (0.5.11361-aarch64-linux)
sorbet-static (0.5.11361-universal-darwin)
sorbet-static (0.5.11361-x86_64-linux)
sorbet-static-and-runtime (0.5.11361)
sorbet (= 0.5.11361)
sorbet-runtime (= 0.5.11361)
sorbet (0.5.11366)
sorbet-static (= 0.5.11366)
sorbet-runtime (0.5.11366)
sorbet-static (0.5.11366-aarch64-linux)
sorbet-static (0.5.11366-universal-darwin)
sorbet-static (0.5.11366-x86_64-linux)
sorbet-static-and-runtime (0.5.11366)
sorbet (= 0.5.11366)
sorbet-runtime (= 0.5.11366)
spoom (1.3.1)
erubi (>= 1.10.0)
prism (>= 0.19.0)
Expand Down
9 changes: 5 additions & 4 deletions Library/Homebrew/vendor/bundle/bundler/setup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,15 @@ def self.extension_api_version
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/racc-1.7.3/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.3.1.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rainbow-3.1.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11361/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11366/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parlour-8.1.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/patchelf-1.5.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/plist-3.7.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/prism-0.27.0")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/prism-0.27.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/pry-0.14.2/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rbi-0.1.12/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/redcarpet-3.6.0")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/redcarpet-3.6.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec-support-3.13.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec-core-3.13.0/lib")
Expand Down Expand Up @@ -99,9 +100,9 @@ def self.extension_api_version
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov_json_formatter-0.1.4/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-0.22.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-cobertura-2.1.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.5.11361-universal-darwin/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.5.11361/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.5.11361/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.5.11366-universal-darwin/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.5.11366/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.5.11366/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/thor-1.3.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/spoom-1.3.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/stackprof-0.2.26")
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,3 @@ module T::Private::Types; end
require_relative 'types/non_forcing_constants'

require_relative 'types/compatibility_patches'

# Sorbet Compiler support module
require_relative 'types/private/compiler'
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def self.disable_vm_prop_serde
# statically, so that methods don't have to guard themselves from being
# called incorrectly by untyped code.
#
# @param [:never, :compiled, :tests, :always] default_checked_level
# @param [:never, :tests, :always] default_checked_level
def self.default_checked_level=(default_checked_level)
T::Private::RuntimeLevels.default_checked_level = default_checked_level
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def checked(level)
if !decl.checked.equal?(ARG_NOT_PROVIDED)
raise BuilderError.new("You can't call .checked multiple times in a signature.")
end
if (level == :never || level == :compiled) && !decl.on_failure.equal?(ARG_NOT_PROVIDED)
if level == :never && !decl.on_failure.equal?(ARG_NOT_PROVIDED)
raise BuilderError.new("You can't use .checked(:#{level}) with .on_failure because .on_failure will have no effect.")
end
if !T::Private::RuntimeLevels::LEVELS.include?(level)
Expand All @@ -119,7 +119,7 @@ def on_failure(*args)
if !decl.on_failure.equal?(ARG_NOT_PROVIDED)
raise BuilderError.new("You can't call .on_failure multiple times in a signature.")
end
if decl.checked == :never || decl.checked == :compiled
if decl.checked == :never
raise BuilderError.new("You can't use .on_failure with .checked(:#{decl.checked}) because .on_failure will have no effect.")
end

Expand Down Expand Up @@ -222,7 +222,7 @@ def finalize!
end
if decl.checked.equal?(ARG_NOT_PROVIDED)
default_checked_level = T::Private::RuntimeLevels.default_checked_level
if (default_checked_level == :never || default_checked_level == :compiled) && !decl.on_failure.equal?(ARG_NOT_PROVIDED)
if default_checked_level == :never && !decl.on_failure.equal?(ARG_NOT_PROVIDED)
raise BuilderError.new("To use .on_failure you must additionally call .checked(:tests) or .checked(:always), otherwise, the .on_failure has no effect.")
end
decl.checked = default_checked_level
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def self.validate_override_types(signature, super_signature)
return if signature.override_allow_incompatible
return if super_signature.mode == Modes.untyped
return unless [signature, super_signature].all? do |sig|
sig.check_level == :always || sig.check_level == :compiled || (sig.check_level == :tests && T::Private::RuntimeLevels.check_tests?)
sig.check_level == :always || (sig.check_level == :tests && T::Private::RuntimeLevels.check_tests?)
end
mode_noun = super_signature.mode == Modes.abstract ? 'implementation' : 'override'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ module T::Private::RuntimeLevels
# Don't even validate in tests, b/c too expensive,
# or b/c we fully trust the static typing
:never,
# Validate the sig when the file is using the Sorbet Compiler.
# Behaves like :never when interpreted.
:compiled,
].freeze

@check_tests = false
Expand Down

0 comments on commit 542edec

Please sign in to comment.