sorbet-runtime 0.5.6397 → 0.5.6405

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e22fe1a2ba1aac1478254198329fc7b30da44cd2db6fc7489734f308b428a6d1
-  data.tar.gz: 89a386ff90ed3098d2e27f5133217294d02da33b39555c7e65cc15a2f2baee39
+  metadata.gz: 7a0e940eff3c6512780d4b148a716a80aaf446e4c92be4aa190f8f530d9a8b57
+  data.tar.gz: d467a3a10ede769405f44c92a62f50a8ed14d93249ad48128d6ffd89e94b9425
 SHA512:
-  metadata.gz: 9d7259cc9f799ecc16fe64b2c67ac6f1a6d543a8887d4fad50c0c2c3eaf8c753f4c6b68557cc14e2beaf4552299488bc38a66ae78d41ab917812f112efd94965
-  data.tar.gz: f7f49616b79dad873cc2433e52ef4c2dea6cdb47d236dfdefc3fc002fa10153d520c57096623b548650193832be585660199a0237bf06607a5d84bef3f6dfc14
+  metadata.gz: 8ddc56972dd9c2361b66af78d5c90e11437c27853027eb1e0d0373ef75a543a6534a9684b2605863d08dc170566381c60b52e0174534100409f702a92498b15b
+  data.tar.gz: b89a80c70a983f6a34695866d595b487bcbc0f931491814537cea570750974d4e43403d599d16fc481fa59da979dbbeda6216319593ada70bb913685e4bace49

data/lib/types/private/methods/signature_validation.rb

@@ -181,7 +181,7 @@ module T::Private::Methods::SignatureValidation
     # arg types must be contravariant
     super_signature.arg_types.zip(signature.arg_types).each_with_index do |((_super_name, super_type), (name, type)), index|
       if !super_type.subtype_of?(type)
-        raise "Incompatible type for arg ##{index + 1} (`#{name}`) in #{mode_noun} of method " \
+        raise "Incompatible type for arg ##{index + 1} (`#{name}`) in signature for #{mode_noun} of method " \
               "`#{signature.method_name}`:\n" \
               "* Base: `#{super_type}` (in #{method_loc_str(super_signature.method)})\n" \
               "* #{mode_noun.capitalize}: `#{type}` (in #{method_loc_str(signature.method)})\n" \
@@ -193,7 +193,7 @@ module T::Private::Methods::SignatureValidation
     super_signature.kwarg_types.each do |name, super_type|
       type = signature.kwarg_types[name]
       if !super_type.subtype_of?(type)
-        raise "Incompatible type for arg `#{name}` in #{mode_noun} of method `#{signature.method_name}`:\n" \
+        raise "Incompatible type for arg `#{name}` in signature for #{mode_noun} of method `#{signature.method_name}`:\n" \
               "* Base: `#{super_type}` (in #{method_loc_str(super_signature.method)})\n" \
               "* #{mode_noun.capitalize}: `#{type}` (in #{method_loc_str(signature.method)})\n" \
               "(The types must be contravariant.)"
@@ -202,7 +202,7 @@ module T::Private::Methods::SignatureValidation
 
     # return types must be covariant
     if !signature.return_type.subtype_of?(super_signature.return_type)
-      raise "Incompatible return type in #{mode_noun} of method `#{signature.method_name}`:\n" \
+      raise "Incompatible return type in signature for #{mode_noun} of method `#{signature.method_name}`:\n" \
             "* Base: `#{super_signature.return_type}` (in #{method_loc_str(super_signature.method)})\n" \
             "* #{mode_noun.capitalize}: `#{signature.return_type}` (in #{method_loc_str(signature.method)})\n" \
             "(The types must be covariant.)"

data/lib/types/types/simple.rb

@@ -41,11 +41,26 @@ module T::Types
     module Private
       module Pool
         def self.type_for_module(mod)
-          cached = mod.instance_variable_get(:@__as_sorbet_simple_type)
+          cached = mod.instance_variable_get(:@__as_sorbet_type)
           return cached if cached
 
-          type = Simple.new(mod)
-          mod.instance_variable_set(:@__as_sorbet_simple_type, type) unless mod.frozen?
+          type = if mod == ::Array
+            T::Array[T.untyped]
+          elsif mod == ::Set
+            T::Set[T.untyped]
+          elsif mod == ::Hash
+            T::Hash[T.untyped, T.untyped]
+          elsif mod == ::Enumerable
+            T::Enumerable[T.untyped]
+          elsif mod == ::Enumerator
+            T::Enumerator[T.untyped]
+          elsif mod == ::Range
+            T::Range[T.untyped]
+          else
+            Simple.new(mod)
+          end
+
+          mod.instance_variable_set(:@__as_sorbet_type, type) unless mod.frozen?
           type
         end
       end

data/lib/types/types/union.rb

@@ -8,12 +8,12 @@ module T::Types
 
     def initialize(types)
       @types = types.flat_map do |type|
-        type = T::Utils.resolve_alias(type)
+        type = T::Utils.coerce(type)
         if type.is_a?(Union)
           # Simplify nested unions (mostly so `name` returns a nicer value)
           type.types
         else
-          T::Utils.coerce(type)
+          type
         end
       end.uniq
     end

data/lib/types/utils.rb

@@ -8,18 +8,6 @@ module T::Utils
       val.aliased_type
     elsif val.is_a?(T::Types::Base)
       val
-    elsif val == ::Array
-      T::Array[T.untyped]
-    elsif val == ::Set
-      T::Set[T.untyped]
-    elsif val == ::Hash
-      T::Hash[T.untyped, T.untyped]
-    elsif val == ::Enumerable
-      T::Enumerable[T.untyped]
-    elsif val == ::Enumerator
-      T::Enumerator[T.untyped]
-    elsif val == ::Range
-      T::Range[T.untyped]
     elsif val.is_a?(Module)
       T::Types::Simple::Private::Pool.type_for_module(val)
     elsif val.is_a?(::Array)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.6397
+  version: 0.5.6405
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-01 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest