7 files changed, 17 insertions, 13 deletions
diff --git a/actionview/lib/action_view/helpers/debug_helper.rb b/actionview/lib/action_view/helpers/debug_helper.rb
index ba47eee9ba..e9dccbad1c 100644
--- a/actionview/lib/action_view/helpers/debug_helper.rb
+++ b/actionview/lib/action_view/helpers/debug_helper.rb
@@ -26,7 +26,7 @@ module ActionView
         Marshal::dump(object)
         object = ERB::Util.html_escape(object.to_yaml)
         content_tag(:pre, object, :class => "debug_dump")
-      rescue Exception  # errors from Marshal or YAML
+      rescue # errors from Marshal or YAML
         # Object couldn't be dumped, perhaps because of singleton methods -- this is the fallback
         content_tag(:code, object.inspect, :class => "debug_dump")
       end
diff --git a/actionview/test/activerecord/debug_helper_test.rb b/actionview/test/activerecord/debug_helper_test.rb
index 5609694cd5..03cb1d5a91 100644
--- a/actionview/test/activerecord/debug_helper_test.rb
+++ b/actionview/test/activerecord/debug_helper_test.rb
@@ -1,8 +1,14 @@
 require 'active_record_unit'
+require 'nokogiri'
 
 class DebugHelperTest < ActionView::TestCase
   def test_debug
     company = Company.new(name: "firebase")
     assert_match "name: firebase", debug(company)
   end
+
+  def test_debug_with_marshal_error
+    obj = -> { }
+    assert_match obj.inspect, Nokogiri.XML(debug(obj)).content
+  end
 end
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 976b559da9..ec6a902c00 100644
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -10,7 +10,7 @@ def run_without_aborting(*tasks)
   tasks.each do |task|
     begin
       Rake::Task[task].invoke
-    rescue Exception
+    rescue
       errors << task
     end
   end
diff --git a/activerecord/test/cases/associations/callbacks_test.rb b/activerecord/test/cases/associations/callbacks_test.rb
index a531e0e02c..a341cb706d 100644
--- a/activerecord/test/cases/associations/callbacks_test.rb
+++ b/activerecord/test/cases/associations/callbacks_test.rb
@@ -180,7 +180,7 @@ class AssociationCallbacksTest < ActiveRecord::TestCase
     assert !@david.unchangable_posts.include?(@authorless)
     begin
       @david.unchangable_posts << @authorless
-    rescue Exception
+    rescue
     end
     assert @david.post_log.empty?
     assert !@david.unchangable_posts.include?(@authorless)
diff --git a/activerecord/test/cases/mixin_test.rb b/activerecord/test/cases/mixin_test.rb
index 7ddb2bfee1..7ebdcac711 100644
--- a/activerecord/test/cases/mixin_test.rb
+++ b/activerecord/test/cases/mixin_test.rb
@@ -61,8 +61,6 @@ class TouchTest < ActiveRecord::TestCase
 
   # Make sure Mixin.record_timestamps gets reset, even if this test fails,
   # so that other tests do not fail because Mixin.record_timestamps == false
-  rescue Exception => e
-    raise e
   ensure
     Mixin.record_timestamps = true
   end
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 744f9edc47..a5f8776f77 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -235,7 +235,7 @@ class QueryCacheTest < ActiveRecord::TestCase
         assert_equal 1, Post.where(title: 'rollback').to_a.count
         raise 'broken'
       end
-    rescue Exception
+    rescue
     end
 
     assert_equal 0, Post.where(title: 'rollback').to_a.count
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index f32bb8a0cc..37f9494272 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -490,17 +490,17 @@ module ActiveSupport
       end
 
       def around(&around)
-        CallbackSequence.new do |*args|
-          around.call(*args) {
-            self.call(*args)
+        CallbackSequence.new do |arg|
+          around.call(arg) {
+            self.call(arg)
           }
         end
       end
 
-      def call(*args)
-        @before.each { |b| b.call(*args) }
-        value = @call.call(*args)
-        @after.each { |a| a.call(*args) }
+      def call(arg)
+        @before.each { |b| b.call(arg) }
+        value = @call.call(arg)
+        @after.each { |a| a.call(arg) }
         value
       end
     end