Move rescue_from type from an interface to ActiveSupport::Rescuable…

…::ClassMethods (ruby#462) * actionpack: Do not redefine ActionController::Base.rescue_from `.rescue_from` method is defined in `ActiveSupport::Rescuable::ClassMethods`. Therefore it would be better to extend it instead of redefinition. * Move rescue_from type definition from an interface to a class --------- Co-authored-by: Takeshi KOMIYA <[email protected]>
sw-square · Jan 22, 2024 · 0e7a1ef · 0e7a1ef
1 parent bd59d6a
commit 0e7a1ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/gems/actionpack/6.0/actioncontroller.rbs b/gems/actionpack/6.0/actioncontroller.rbs
@@ -4,14 +4,8 @@ module ActionController
     def flash: () -> untyped
   end
 
-  interface _API_and_Base_singletion
-    def rescue_from: (*Class, ?with: Symbol | Proc) -> void
-                   | (*Class) { (Exception) -> void } -> void
-  end
-
   class Base < Metal
     include _API_and_Base
-    extend _API_and_Base_singletion
 
     # https://github.com/rails/rails/blob/v6.0.3.2/actionpack/lib/action_controller/base.rb#L205-L255
     include AbstractController::Rendering
@@ -59,6 +53,8 @@ module ActionController
     include AbstractController::Callbacks
     extend AbstractController::Callbacks::ClassMethods
     include Rescue
+    include ActiveSupport::Rescuable
+    extend ActiveSupport::Rescuable::ClassMethods
     include Instrumentation
     extend Instrumentation::ClassMethods
     include ParamsWrapper
@@ -67,7 +63,6 @@ module ActionController
 
   class API < Metal
     include _API_and_Base
-    extend _API_and_Base_singletion
 
     # https://github.com/rails/rails/blob/v6.0.3.2/actionpack/lib/action_controller/api.rb#L112-L145
     include AbstractController::Rendering
@@ -87,6 +82,8 @@ module ActionController
     include AbstractController::Callbacks
     extend AbstractController::Callbacks::ClassMethods
     include Rescue
+    include ActiveSupport::Rescuable
+    extend ActiveSupport::Rescuable::ClassMethods
     include Instrumentation
     extend Instrumentation::ClassMethods
     include ParamsWrapper

diff --git a/gems/activesupport/6.0/activesupport-generated.rbs b/gems/activesupport/6.0/activesupport-generated.rbs
@@ -10819,7 +10819,8 @@ module ActiveSupport
       #   end
       #
       # Exceptions raised inside exception handlers are not propagated up.
-      def rescue_from: (*untyped klasses, ?with: untyped? with) { () -> untyped } -> untyped
+      def rescue_from: (*Class, ?with: Symbol | Proc) -> void
+                     | (*Class) { (Exception) -> void } -> void
 
       # Matches an exception to a handler based on the exception class.
       #