callbacks.rb in actionpack-6.1.0.rc1

- old
+ new

@@ -35,11 +35,11 @@
                        skip_after_callbacks_if_terminated: true
     end
 
     # Override <tt>AbstractController::Base#process_action</tt> to run the
     # <tt>process_action</tt> callbacks around the normal behavior.
-    def process_action(*args)
+    def process_action(*)
       run_callbacks(:process_action) do
         super
       end
     end
 
@@ -67,10 +67,10 @@
         _normalize_callback_option(options, :only, :if)
         _normalize_callback_option(options, :except, :unless)
       end
 
       def _normalize_callback_option(options, from, to) # :nodoc:
-        if from = options[from]
+        if from = options.delete(from)
           _from = Array(from).map(&:to_s).to_set
           from = proc { |c| _from.include? c.action_name }
           options[to] = Array(options[to]).unshift(from)
         end
       end