From 78202055c971659689f6a96a5b4aa2c138cb44d2 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 14 May 2013 12:03:33 -0700 Subject: fix shadowed variable warnings --- activesupport/lib/active_support/callbacks.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'activesupport/lib/active_support/callbacks.rb') diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index cc4f589203..ab3bb23e88 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -507,9 +507,9 @@ module ActiveSupport @callbacks = nil end - def each(&block); @chain.each(&block); end - def index(o); @chain.index(o); end - def empty?; @chain.empty?; end + def each(&block); @chain.each(&block); end + def index(o); @chain.index(o); end + def empty?; @chain.empty?; end def insert(index, o) @callbacks = nil @@ -629,9 +629,9 @@ module ActiveSupport # existing chain rather than appended. def set_callback(name, *filter_list, &block) type, filters, options = normalize_callback_params(name, filter_list, block) - chain = get_callbacks name + self_chain = get_callbacks name mapped = filters.map do |filter| - Callback.build(chain, filter, type, options.dup) + Callback.build(self_chain, filter, type, options.dup) end __update_callbacks(name) do |target, chain| -- cgit v1.2.3