Skip to content

Commit

Permalink
Merge pull request #17908 from Homebrew/dependabot/bundler/Library/Ho…
Browse files Browse the repository at this point in the history
…mebrew/sorbet-0.5.11500
  • Loading branch information
p-linnane authored Jul 30, 2024
2 parents 65725ed + 88eb68b commit c609f24
Show file tree
Hide file tree
Showing 90 changed files with 51 additions and 54 deletions.
19 changes: 10 additions & 9 deletions Library/Homebrew/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ GEM
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
simpleidn (0.2.3)
sorbet (0.5.11495)
sorbet-static (= 0.5.11495)
sorbet-runtime (0.5.11495)
sorbet-static (0.5.11495-aarch64-linux)
sorbet-static (0.5.11495-universal-darwin)
sorbet-static (0.5.11495-x86_64-linux)
sorbet-static-and-runtime (0.5.11495)
sorbet (= 0.5.11495)
sorbet-runtime (= 0.5.11495)
sorbet (0.5.11500)
sorbet-static (= 0.5.11500)
sorbet-runtime (0.5.11500)
sorbet-static (0.5.11500-aarch64-linux)
sorbet-static (0.5.11500-universal-darwin)
sorbet-static (0.5.11500-x86_64-linux)
sorbet-static-and-runtime (0.5.11500)
sorbet (= 0.5.11500)
sorbet-runtime (= 0.5.11500)
spoom (1.4.2)
erubi (>= 1.10.0)
prism (>= 0.28.0)
Expand Down Expand Up @@ -148,6 +148,7 @@ GEM

PLATFORMS
aarch64-linux
arm-linux
arm64-darwin
x86_64-darwin
x86_64-linux
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Library/Homebrew/vendor/bundle/bundler/setup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def self.extension_api_version
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/racc-1.8.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.3.4.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.11495/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11500/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parlour-9.0.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")
Expand Down Expand Up @@ -101,11 +101,11 @@ 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.11495-universal-darwin/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.5.11495/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.5.11495/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.5.11500-universal-darwin/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.5.11500/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.5.11500/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.4.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/spoom-1.4.2/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/stackprof-0.2.26")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/stackprof-0.2.26/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/yard-0.9.36/lib")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def recursively_valid?(obj)
valid?(obj)
end

def valid?(obj)
define_method(:valid?) do |_obj|
raise NotImplementedError
end

Expand All @@ -35,12 +35,12 @@ def valid?(obj)

# Force any lazy initialization that this type might need to do
# It's unusual to call this directly; you probably want to call it indirectly via `T::Utils.run_all_sig_blocks`.
def build_type
define_method(:build_type) do
raise NotImplementedError
end

# Equality is based on name, so be sure the name reflects all relevant state when implementing.
def name
define_method(:name) do
raise NotImplementedError
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def name

# overrides Base
def valid?(obj)
obj.is_a?(Module) && obj <= @type
obj.is_a?(Module) && (obj <= @type || false)
end

# overrides Base
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def valid?(obj)
return false
end
arg_types.values.zip(other.arg_types.values).all? do |a, b|
b.subtype_of?(a)
!b.nil? && b.subtype_of?(a)
end && returns.subtype_of?(other.returns)
else
false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def self.type_for_module(mod)

class Untyped < TypedArray
def initialize
super(T.untyped)
super(T::Types::Untyped::Private::INSTANCE)
end

def valid?(obj)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def self.type_for_module(mod)

class Untyped < TypedClass
def initialize
super(T.untyped)
super(T::Types::Untyped::Private::INSTANCE)
end

def freeze
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@ def recursively_valid?(obj)
true
end
when Hash
return false unless type.is_a?(FixedArray)
types = type.types
return false if types.count != 2
key_type = types[0]
value_type = types[1]
type_ = self.type
return false unless type_.is_a?(FixedArray)
key_type, value_type = type_.types
return false if key_type.nil? || value_type.nil? || type_.types.size > 2
obj.each_pair do |key, val|
# Some objects (I'm looking at you Rack::Utils::HeaderHash) don't
# iterate over a [key, value] array, so we can't just use the type.recursively_valid?(v)
Expand Down Expand Up @@ -179,7 +178,7 @@ def describe_obj(obj)

class Untyped < TypedEnumerable
def initialize
super(T.untyped)
super(T::Types::Untyped::Private::INSTANCE)
end

def valid?(obj)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def new(*args, &blk)

class Untyped < TypedEnumerator
def initialize
super(T.untyped)
super(T::Types::Untyped::Private::INSTANCE)
end

def valid?(obj)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def new(*args, &blk)

class Untyped < TypedEnumeratorChain
def initialize
super(T.untyped)
super(T::Types::Untyped::Private::INSTANCE)
end

def valid?(obj)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def new(*args, &blk)

class Untyped < TypedEnumeratorLazy
def initialize
super(T.untyped)
super(T::Types::Untyped::Private::INSTANCE)
end

def valid?(obj)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module T::Types
class TypedRange < TypedEnumerable
def underlying_class
Hash
Range
end

# overrides Base
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module T::Types
class TypedSet < TypedEnumerable
def underlying_class
Hash
Set
end

# overrides Base
Expand Down Expand Up @@ -37,7 +37,7 @@ def new(*args)

class Untyped < TypedSet
def initialize
super(T.untyped)
super(T::Types::Untyped::Private::INSTANCE)
end

def valid?(obj)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def self.lift_enum(enum)
raise ArgumentError.new("#{enum.inspect} is not a T.deprecated_enum")
end

classes = enum.values.map(&:class).uniq
classes = T.unsafe(enum.values).map(&:class).uniq
if classes.empty?
T.untyped
elsif classes.length > 1
Expand Down

0 comments on commit c609f24

Please sign in to comment.