зеркало из https://github.com/github/ruby.git
Revert "Prefer #send over #__send__ when it is clear there is no possible conflict"
This reverts commit 4dba0c1a8e
.
Matz's comment is "send is not deprecated. __send__ is safer".
But "Prefer #send over #__send__" is not reasonable.
This commit is contained in:
Родитель
b29fe5eb2d
Коммит
3407b7d8a6
|
@ -189,7 +189,7 @@ module Forwardable
|
|||
# If it's not a class or module, it's an instance
|
||||
mod = Module === self ? self : singleton_class
|
||||
ret = mod.module_eval(&gen)
|
||||
mod.send(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7'
|
||||
mod.__send__(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7'
|
||||
ret
|
||||
end
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ module IRB
|
|||
module ExtendCommand
|
||||
class Fork < Nop
|
||||
def execute
|
||||
pid = send ExtendCommand.irb_original_method_name("fork")
|
||||
pid = __send__ ExtendCommand.irb_original_method_name("fork")
|
||||
unless pid
|
||||
class << self
|
||||
alias_method :exit, ExtendCommand.irb_original_method_name('exit')
|
||||
|
|
|
@ -268,7 +268,7 @@ module IRB
|
|||
PerfectMatchedProc = ->(matched, bind: IRB.conf[:MAIN_CONTEXT].workspace.binding) {
|
||||
RDocRIDriver ||= RDoc::RI::Driver.new
|
||||
if matched =~ /\A(?:::)?RubyVM/ and not ENV['RUBY_YES_I_AM_NOT_A_NORMAL_USER']
|
||||
IRB.send(:easter_egg)
|
||||
IRB.__send__(:easter_egg)
|
||||
return
|
||||
end
|
||||
namespace = retrieve_completion_data(matched, bind: bind, doc_namespace: true)
|
||||
|
|
|
@ -135,4 +135,4 @@ module IRB
|
|||
end
|
||||
end
|
||||
|
||||
IRB.send(:easter_egg, ARGV[0]&.to_sym) if $0 == __FILE__
|
||||
IRB.__send__(:easter_egg, ARGV[0]&.to_sym) if $0 == __FILE__
|
||||
|
|
|
@ -88,7 +88,7 @@ def cp
|
|||
options[:preserve] = true if options.delete :p
|
||||
dest = argv.pop
|
||||
argv = argv[0] if argv.size == 1
|
||||
FileUtils.send cmd, argv, dest, **options
|
||||
FileUtils.__send__ cmd, argv, dest, **options
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -109,7 +109,7 @@ def ln
|
|||
options[:force] = true if options.delete :f
|
||||
dest = argv.pop
|
||||
argv = argv[0] if argv.size == 1
|
||||
FileUtils.send cmd, argv, dest, **options
|
||||
FileUtils.__send__ cmd, argv, dest, **options
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -144,7 +144,7 @@ def rm
|
|||
cmd = "rm"
|
||||
cmd += "_r" if options.delete :r
|
||||
options[:force] = true if options.delete :f
|
||||
FileUtils.send cmd, argv, **options
|
||||
FileUtils.__send__ cmd, argv, **options
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -161,7 +161,7 @@ def mkdir
|
|||
setup("p") do |argv, options|
|
||||
cmd = "mkdir"
|
||||
cmd += "_p" if options.delete :p
|
||||
FileUtils.send cmd, argv, **options
|
||||
FileUtils.__send__ cmd, argv, **options
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче