From b82500e396b728f6dea42916fe3d491d7ba4224d Mon Sep 17 00:00:00 2001
From: rxing <rick.xing@rcpaqap.com.au>
Date: Wed, 11 Feb 2015 11:56:01 +1100
Subject: remove unnecessary assignment and parameter passing in
 ActiveSupport::Callbacks::Filters::Around

---
 activesupport/lib/active_support/callbacks.rb | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 0d5035f637..51cf468d2b 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -291,13 +291,11 @@ module ActiveSupport
 
             if !halted && user_conditions.all? { |c| c.call(target, value) }
               user_callback.call(target, value) {
-                env = run.call env
-                env.value
+                run.call.value
               }
-
               env
             else
-              run.call env
+              run.call
             end
           end
         end
@@ -309,11 +307,10 @@ module ActiveSupport
             value  = env.value
 
             if env.halted
-              run.call env
+              run.call
             else
               user_callback.call(target, value) {
-                env = run.call env
-                env.value
+                run.call.value
               }
               env
             end
@@ -328,12 +325,11 @@ module ActiveSupport
 
             if user_conditions.all? { |c| c.call(target, value) }
               user_callback.call(target, value) {
-                env = run.call env
-                env.value
+                run.call.value
               }
               env
             else
-              run.call env
+              run.call
             end
           end
         end
@@ -342,8 +338,7 @@ module ActiveSupport
         def self.simple(callback_sequence, user_callback)
           callback_sequence.around do |env, &run|
             user_callback.call(env.target, env.value) {
-              env = run.call env
-              env.value
+              run.call.value
             }
             env
           end
-- 
cgit v1.2.3