sorbet-runtime 0.6.13224 → 0.6.13226

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebcfe299fdcacb76c43f265149c1ca489e7c0ae37c1b7df330a11040e6b4687c
-  data.tar.gz: 764b610e2e34c154fe5f87b020352bd6e6837769f4f68a1076b0f3ffc875600f
+  metadata.gz: e907a4879f20cbb646044c37f44b50280d00aec1667f104c47042d78825bc577
+  data.tar.gz: 4749bfa922d12839e963d08b99c8fef4637c238728527a9a287f6fdad2688841
 SHA512:
-  metadata.gz: 92b49a148142fd0947fdc2162ed0e426bbc14cbe7409cad9fd72ac27d6ff150c43b5dfcce68e66f0c55831794424df4a6ed3819b202a9789c5701f42a3d74eb8
-  data.tar.gz: 38e6f15d72de0cbff9a6e482989cb1b0bd396307745684d78947e6901d6de0c67ccdc9cf5971c1bb2c67e8c82199f22cc1ff6f06b9ce0bc949453e4662427b44
+  metadata.gz: 4870335d1730b9240f4b81b1d8ae948850d5833ed7d341cbbcccd8817a1ba1dd3b3afeb472c440514c7fc0a3019a29ea7b2b07675f12cd7a8f650fa983d61102
+  data.tar.gz: bcae385c2a650224bafe810e1295cda429c73d2612ffe5a4c3c3aa75345c6e38c7bcc207989ebf2e667040cf015b31cc28309689640758686cc4d8d52ec79e88

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

@@ -48,15 +48,9 @@ module T::Private::Methods
   #   (This can matter for circular load-time behavior, where a method is
   #   called while its Signature is being built)
   # - It's `nil` if we've finished building the sig
-  DeclarationBlock = Struct.new(:mod, :loc, :blk_or_decl, :final, :raw)
+  DeclarationBlock = Struct.new(:mod, :loc, :blk_or_decl, :final)
 
   def self.declare_sig(mod, loc, arg, &blk)
-    T::Private::DeclState.current.active_declaration = _declare_sig_internal(mod, loc, arg, &blk)
-
-    nil
-  end
-
-  private_class_method def self._declare_sig_internal(mod, loc, arg, raw: false, &blk)
     install_hooks(mod)
 
     if T::Private::DeclState.current.active_declaration
@@ -68,11 +62,13 @@ module T::Private::Methods
       raise "Invalid argument to `sig`: #{arg}"
     end
 
-    DeclarationBlock.new(mod, loc, blk, arg == :final, raw)
+    T::Private::DeclState.current.active_declaration = DeclarationBlock.new(mod, loc, blk, arg == :final)
+
+    nil
   end
 
   def self.start_proc
-    DeclBuilder.new(PROC_TYPE, false)
+    DeclBuilder.new(PROC_TYPE)
   end
 
   def self.finalize_proc(decl)
@@ -233,31 +229,29 @@ module T::Private::Methods
     # This wrapper is very slow, so it will subsequently re-wrap with a much faster wrapper
     # (or unwrap back to the original method).
     key = method_owner_and_name_to_key(mod, method_name)
-    unless current_declaration.raw
-      T::Private::ClassUtils.replace_method(original_method, mod, method_name) do |*args, &blk|
-        method_sig = T::Private::Methods.maybe_run_sig_block_for_key(key)
-        method_sig ||= T::Private::Methods._handle_missing_method_signature(
-          self,
-          original_method,
-          __callee__ || raise("Unknown __callee__ for method without a signature"),
-        )
-
-        # Should be the same logic as CallValidation.wrap_method_if_needed but we
-        # don't want that extra layer of indirection in the callstack
-        if method_sig.mode == T::Private::Methods::Modes.abstract
-          # We're in an interface method, keep going up the chain
-          if defined?(super)
-            super(*args, &blk)
-          else
-            raise NotImplementedError.new("The method `#{method_sig.method_name}` on #{mod} is declared as `abstract`. It does not have an implementation.")
-          end
-        # Note, this logic is duplicated (intentionally, for micro-perf) at `CallValidation.wrap_method_if_needed`,
-        # make sure to keep changes in sync.
-        elsif method_sig.check_level == :always || (method_sig.check_level == :tests && T::Private::RuntimeLevels.check_tests?)
-          CallValidation.validate_call(self, original_method, method_sig, args, blk)
+    T::Private::ClassUtils.replace_method(original_method, mod, method_name) do |*args, &blk|
+      method_sig = T::Private::Methods.maybe_run_sig_block_for_key(key)
+      method_sig ||= T::Private::Methods._handle_missing_method_signature(
+        self,
+        original_method,
+        __callee__ || raise("Unknown __callee__ for method without a signature"),
+      )
+
+      # Should be the same logic as CallValidation.wrap_method_if_needed but we
+      # don't want that extra layer of indirection in the callstack
+      if method_sig.mode == T::Private::Methods::Modes.abstract
+        # We're in an interface method, keep going up the chain
+        if defined?(super)
+          super(*args, &blk)
         else
-          original_method.bind_call(self, *args, &blk)
+          raise NotImplementedError.new("The method `#{method_sig.method_name}` on #{mod} is declared as `abstract`. It does not have an implementation.")
         end
+      # Note, this logic is duplicated (intentionally, for micro-perf) at `CallValidation.wrap_method_if_needed`,
+      # make sure to keep changes in sync.
+      elsif method_sig.check_level == :always || (method_sig.check_level == :tests && T::Private::RuntimeLevels.check_tests?)
+        CallValidation.validate_call(self, original_method, method_sig, args, blk)
+      else
+        original_method.bind_call(self, *args, &blk)
       end
     end
 
@@ -343,7 +337,7 @@ module T::Private::Methods
       raise "DeclarationBlock for #{declaration_block.mod} at #{declaration_block.loc} should have already been unwrapped"
     end
 
-    builder = DeclBuilder.new(declaration_block.mod, declaration_block.raw)
+    builder = DeclBuilder.new(declaration_block.mod)
     decl = builder.instance_exec(&blk_or_decl).finalize!.decl
     # Record that we've already run `blk` once and constructed a `Declaration`
     declaration_block.blk_or_decl = decl

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

@@ -15,7 +15,7 @@ module T::Private::Methods
       end
     end
 
-    def initialize(mod, raw)
+    def initialize(mod)
       @decl = Declaration.new(
         mod,
         ARG_NOT_PROVIDED, # params
@@ -27,7 +27,6 @@ module T::Private::Methods
         ARG_NOT_PROVIDED, # on_failure
         false, # override_allow_incompatible
         ARG_NOT_PROVIDED, # type_parameters
-        raw
       )
     end
 

metadata

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