sorbet-runtime 0.6.13189 → 0.6.13192

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6bf8fcb2561e2428429b30dc9059636064a8a735e253fe40f42345c634dc9a
-  data.tar.gz: 156e30c64f4ef4dad43b989ee8a462d458b8c282956de77a9f1f9e21ee2b08d8
+  metadata.gz: bf43d3cf4e297c8c2c814618b558777e99dad15ee9fdedaf1275adac6303b1ab
+  data.tar.gz: 9b454b18a90066a60aef190a683699dae158bf6e0d42be29b4314e3e5a28a072
 SHA512:
-  metadata.gz: 85b4031fe378bad5cb9982bf02b9b4f52f888a02f3d5ef3442ef27c0343da8c9415bf443b798933807b59fb74519f8706965ac0a06a72f883ae15d6b29a5cdab
-  data.tar.gz: de199554534b1c28bbcfd69c7718bbd1b128190e7d91102eb93d24c257b4df186be56c7c617ad1fb08491ff18efa35dfc0494197a903367a14eff2bdb34e0a30
+  metadata.gz: b5e5e921d5a506dabd5fe96e434a73723ec8105ac8f4d554379f2e82f265e965dfbeed04b04b1875f8f35520467bb35d41f8baf8dc6558d07068e1ece3f55af6
+  data.tar.gz: 145f14e022976650ccbed8a8abe9398970d687759833650185156e4e4156d91b7fd7b54ade90a86c7be2a916b608880ae739d1d8473e629c29714c1330a33b6b

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

@@ -74,22 +74,30 @@ module T::Private::Methods::CallValidation
   def self.create_validator_method(mod, original_method, method_sig, original_visibility)
     has_fixed_arity = method_sig.kwarg_types.empty? && method_sig.rest_type.nil? && method_sig.keyrest_type.nil? &&
       original_method.parameters.all? { |(kind, _name)| kind == :req || kind == :block }
-    can_skip_block_type = method_sig.block_type.nil? || method_sig.block_type.valid?(nil)
+
+    # nil implies block_type.nil?
+    # true implies !block_type.nil? and block_type.valid?(nil)
+    # false implies !block_type.nil? and !block_type.valid?(nil)
+    # This formulation avoids a type error without introducing extra method calls or local vars
+    can_skip_block_type = method_sig.block_type&.valid?(nil) != false
+
     ok_for_fast_path = has_fixed_arity && can_skip_block_type && !method_sig.bind && method_sig.arg_types.length < 5 && is_allowed_to_have_fast_path
 
     all_args_are_simple = ok_for_fast_path && method_sig.arg_types.all? { |_name, type| type.is_a?(T::Types::Simple) }
-    simple_method = all_args_are_simple && method_sig.effective_return_type.is_a?(T::Types::Simple)
-    simple_procedure = all_args_are_simple && method_sig.effective_return_type.is_a?(T::Private::Types::Void)
+
+    effective_return_type = method_sig.effective_return_type
+    simple_method = all_args_are_simple && effective_return_type.is_a?(T::Types::Simple)
+    simple_procedure = all_args_are_simple && effective_return_type.is_a?(T::Private::Types::Void)
 
     # All the types for which valid? unconditionally returns `true`
     return_is_ignorable =
-      method_sig.effective_return_type.equal?(T::Types::Untyped::Private::INSTANCE) ||
-      method_sig.effective_return_type.equal?(T::Types::Anything::Private::INSTANCE) ||
-      method_sig.effective_return_type.equal?(T::Types::AttachedClassType::Private::INSTANCE) ||
-      method_sig.effective_return_type.equal?(T::Types::SelfType::Private::INSTANCE) ||
-      method_sig.effective_return_type.is_a?(T::Types::TypeParameter) ||
-      method_sig.effective_return_type.is_a?(T::Types::TypeVariable) ||
-      (method_sig.effective_return_type.is_a?(T::Types::Simple) && method_sig.effective_return_type.raw_type.equal?(BasicObject))
+      effective_return_type.equal?(T::Types::Untyped::Private::INSTANCE) ||
+      effective_return_type.equal?(T::Types::Anything::Private::INSTANCE) ||
+      effective_return_type.equal?(T::Types::AttachedClassType::Private::INSTANCE) ||
+      effective_return_type.equal?(T::Types::SelfType::Private::INSTANCE) ||
+      effective_return_type.is_a?(T::Types::TypeParameter) ||
+      effective_return_type.is_a?(T::Types::TypeVariable) ||
+      (effective_return_type.is_a?(T::Types::Simple) && effective_return_type.raw_type.equal?(BasicObject))
 
     returns_anything_method = all_args_are_simple && return_is_ignorable
 
@@ -101,7 +109,7 @@ module T::Private::Methods::CallValidation
           create_validator_method_skip_return_fast(mod, original_method, method_sig, original_visibility)
         elsif simple_procedure
           create_validator_procedure_fast(mod, original_method, method_sig, original_visibility)
-        elsif ok_for_fast_path && method_sig.effective_return_type.is_a?(T::Private::Types::Void)
+        elsif ok_for_fast_path && effective_return_type.is_a?(T::Private::Types::Void)
           create_validator_procedure_medium(mod, original_method, method_sig, original_visibility)
         elsif ok_for_fast_path && return_is_ignorable
           create_validator_method_skip_return_medium(mod, original_method, method_sig, original_visibility)

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

@@ -187,8 +187,8 @@ class T::Private::Methods::Signature
     # causes forwarding **kwargs to do the wrong thing: see https://bugs.ruby-lang.org/issues/10708
     # and https://bugs.ruby-lang.org/issues/11860.
     args_length = args.length
-    if (args_length > @req_arg_count) && (!@kwarg_types.empty? || !@keyrest_type.nil?) && args[-1].is_a?(Hash)
-      kwargs = args[-1]
+    if (args_length > @req_arg_count) && (!@kwarg_types.empty? || !@keyrest_type.nil?) && (last_arg = args[-1]).is_a?(Hash)
+      kwargs = last_arg
       args_length -= 1
     else
       kwargs = EMPTY_HASH
@@ -208,7 +208,8 @@ class T::Private::Methods::Signature
       # Process given pre-rest args. When there are no rest args,
       # this is just the given number of args.
       while it < args_length && it < @arg_types.length
-        yield @arg_types[it][0], args[it], @arg_types[it][1]
+        arg_type = @arg_types.fetch(it)
+        yield arg_type[0], args[it], arg_type[1]
         it += 1
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.6.13189
+  version: 0.6.13192
 platform: ruby
 authors:
 - Stripe