diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index a72542b70b..09fc9a35b5 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -624,6 +624,7 @@ module ActionMailer
@_message = NullMail.new unless @_mail_was_called
end
end
+ ruby2_keywords(:process)
class NullMail # :nodoc:
def body; "" end
diff --git a/actionmailer/lib/action_mailer/rescuable.rb b/actionmailer/lib/action_mailer/rescuable.rb
index 5a9927ebb9..facde36eeb 100644
--- a/actionmailer/lib/action_mailer/rescuable.rb
+++ b/actionmailer/lib/action_mailer/rescuable.rb
@@ -20,7 +20,7 @@ module ActionMailer # :nodoc:
end
private
- def process(*)
+ def process(...)
handle_exceptions do
super
end
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index 0ccb5c7a7d..f357412fa5 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -155,6 +155,7 @@ module AbstractController
process_action(action_name, *args)
end
+ ruby2_keywords(:process)
# Delegates to the class's ::controller_path.
def controller_path
@@ -215,8 +216,8 @@ module AbstractController
#
# Notice that the first argument is the method to be dispatched
# which is *not* necessarily the same as the action name.
- def process_action(method_name, *args)
- send_action(method_name, *args)
+ def process_action(...)
+ send_action(...)
end
# Actually call the method associated with the action. Override
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index e16e5cded3..6bab1ead35 100644
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@@ -244,7 +244,7 @@ module AbstractController
private
# Override AbstractController::Base#process_action to run the
# process_action callbacks around the normal behavior.
- def process_action(*)
+ def process_action(...)
run_callbacks(:process_action) do
super
end
diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb
index fb22afb768..ced0ca8ce6 100644
--- a/actionview/lib/action_view/rendering.rb
+++ b/actionview/lib/action_view/rendering.rb
@@ -34,7 +34,7 @@ module ActionView
end
# Override process to set up I18n proxy.
- def process(*) # :nodoc:
+ def process(...) # :nodoc:
old_config, I18n.config = I18n.config, I18nProxy.new(I18n.config, lookup_context)
super
ensure
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 4a734bcc22..104480b88b 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -471,6 +471,7 @@ module ActiveModel
def attribute_missing(match, *args, &block)
__send__(match.proxy_target, match.attr_name, *args, &block)
end
+ ruby2_keywords(:attribute_missing)
# A +Person+ instance with a +name+ attribute can ask
# person.respond_to?(:name), person.respond_to?(:name=),
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 68a7de2d49..4b130caedb 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -429,10 +429,10 @@ module ActiveRecord
end
end
- def _exec_scope(*args, &block) # :nodoc:
+ def _exec_scope(...) # :nodoc:
@delegate_to_klass = true
registry = klass.scope_registry
- _scoping(nil, registry) { instance_exec(*args, &block) || self }
+ _scoping(nil, registry) { instance_exec(...) || self }
ensure
@delegate_to_klass = false
end