Prefer "included" language over "setup"

4 files changed, 15 insertions, 12 deletions

diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index c8b509081c..d7faaf4236 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -1,10 +1,13 @@
 module AbstractController
   module Callbacks
-    setup do
-      include ActiveSupport::NewCallbacks
-      define_callbacks :process_action      
+    extend ActiveSupport::DependencyModule
+
+    depends_on ActiveSupport::NewCallbacks
+
+    included do
+      define_callbacks :process_action
     end
-    
+
     def process_action
       _run_process_action_callbacks(action_name) do
         super
diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index ffcae29ddc..62caa119e7 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -3,8 +3,8 @@ module AbstractController
     extend ActiveSupport::DependencyModule
 
     depends_on Renderer
-    
-    setup do
+
+    included do
       extlib_inheritable_accessor :master_helper_module
       self.master_helper_module = Module.new
     end
diff --git a/actionpack/lib/action_controller/abstract/logger.rb b/actionpack/lib/action_controller/abstract/logger.rb
index bdb8defa0c..5fb78f1755 100644
--- a/actionpack/lib/action_controller/abstract/logger.rb
+++ b/actionpack/lib/action_controller/abstract/logger.rb
@@ -2,7 +2,7 @@ module AbstractController
   module Logger
     extend ActiveSupport::DependencyModule
 
-    setup do
+    included do
       cattr_accessor :logger
     end
   end
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index 531eb28dcb..beb848f90e 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -5,15 +5,15 @@ module AbstractController
     extend ActiveSupport::DependencyModule
 
     depends_on AbstractController::Logger
-    
-    setup do
+
+    included do
       attr_internal :formats
-      
+
       extlib_inheritable_accessor :_view_paths
-      
+
       self._view_paths ||= ActionView::PathSet.new
     end
-        
+
     def _action_view
       @_action_view ||= ActionView::Base.new(self.class.view_paths, {}, self)      
     end