aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-07 01:08:59 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-07 01:08:59 -0500
commit983dc8078708fff5d99fc31eb5eac8b532e950b3 (patch)
tree2eed135f0e53cfef3d962313fcfb17caf605411a
parent66d4b558993ab9a92303d905fea6a01800dd0474 (diff)
downloadrails-983dc8078708fff5d99fc31eb5eac8b532e950b3.tar.gz
rails-983dc8078708fff5d99fc31eb5eac8b532e950b3.tar.bz2
rails-983dc8078708fff5d99fc31eb5eac8b532e950b3.zip
Don't shadow local with black arg
-rw-r--r--activesupport/lib/active_support/rescuable.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/rescuable.rb b/activesupport/lib/active_support/rescuable.rb
index f2bc12e832..c27c4ddb1a 100644
--- a/activesupport/lib/active_support/rescuable.rb
+++ b/activesupport/lib/active_support/rescuable.rb
@@ -78,7 +78,7 @@ module ActiveSupport
def handler_for_rescue(exception)
# We go from right to left because pairs are pushed onto rescue_handlers
# as rescue_from declarations are found.
- _, handler = Array(rescue_handlers).reverse.detect do |klass_name, handler|
+ _, rescuer = Array(rescue_handlers).reverse.detect do |klass_name, handler|
# The purpose of allowing strings in rescue_from is to support the
# declaration of handler associations for exception classes whose
# definition is yet unknown.
@@ -97,11 +97,11 @@ module ActiveSupport
exception.is_a?(klass) if klass
end
- case handler
+ case rescuer
when Symbol
- method(handler)
+ method(rescuer)
when Proc
- handler.bind(self)
+ rescuer.bind(self)
end
end
end