diff options
author | Jeremy Daer <jeremydaer@gmail.com> | 2018-02-16 17:14:27 -0800 |
---|---|---|
committer | Jeremy Daer <jeremydaer@gmail.com> | 2018-02-17 10:03:37 -0800 |
commit | 1e526788e6b1d3f42f4d8fdca20e588d42838c80 (patch) | |
tree | 84e6e91540d45de54f4218ad72cca9863723d8be /activesupport/lib/active_support/core_ext/module/redefine_method.rb | |
parent | a713fdae4eb4f7ccd34932edc61561a96b8d9f35 (diff) | |
download | rails-1e526788e6b1d3f42f4d8fdca20e588d42838c80.tar.gz rails-1e526788e6b1d3f42f4d8fdca20e588d42838c80.tar.bz2 rails-1e526788e6b1d3f42f4d8fdca20e588d42838c80.zip |
Rails 6 requires Ruby 2.3+
Diffstat (limited to 'activesupport/lib/active_support/core_ext/module/redefine_method.rb')
-rw-r--r-- | activesupport/lib/active_support/core_ext/module/redefine_method.rb | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/activesupport/lib/active_support/core_ext/module/redefine_method.rb b/activesupport/lib/active_support/core_ext/module/redefine_method.rb index a0a6622ca4..5bd8e6e973 100644 --- a/activesupport/lib/active_support/core_ext/module/redefine_method.rb +++ b/activesupport/lib/active_support/core_ext/module/redefine_method.rb @@ -1,23 +1,14 @@ # frozen_string_literal: true class Module - if RUBY_VERSION >= "2.3" - # Marks the named method as intended to be redefined, if it exists. - # Suppresses the Ruby method redefinition warning. Prefer - # #redefine_method where possible. - def silence_redefinition_of_method(method) - if method_defined?(method) || private_method_defined?(method) - # This suppresses the "method redefined" warning; the self-alias - # looks odd, but means we don't need to generate a unique name - alias_method method, method - end - end - else - def silence_redefinition_of_method(method) - if method_defined?(method) || private_method_defined?(method) - alias_method :__rails_redefine, method - remove_method :__rails_redefine - end + # Marks the named method as intended to be redefined, if it exists. + # Suppresses the Ruby method redefinition warning. Prefer + # #redefine_method where possible. + def silence_redefinition_of_method(method) + if method_defined?(method) || private_method_defined?(method) + # This suppresses the "method redefined" warning; the self-alias + # looks odd, but means we don't need to generate a unique name + alias_method method, method end end |