From f2a91397fd7f9ca5bb3d296ec6df2de6f9cfc7cb Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 12 Dec 2017 11:56:25 +0000 Subject: Add uplevel keyword to Kernel#warn and use it If uplevel keyword is given, the warning message is prepended with caller file and line information and the string "warning: ". The use of the uplevel keyword makes Kernel#warn format output similar to how rb_warn formats output. This patch modifies net/ftp and net/imap to use Kernel#warn instead of $stderr.puts or $stderr.printf, since they are used for printing warnings. This makes lib/cgi/core and tempfile use $stderr.puts instead of warn for debug logging, since they are used for debug printing and not for warning. This does not modify bundler, rubygems, or rdoc, as those are maintained outside of ruby and probably wish to remain backwards compatible with older ruby versions. rb_warn_m code is originally from nobu, but I've changed it so that it only includes the path and lineno from uplevel (not the method), and also prepends the string "warning: ", to make it more similar to rb_warn. From: Jeremy Evans code@jeremyevans.net Signed-off-by: Urabe Shyouhei shyouhei@ruby-lang.org git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/delegate.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/delegate.rb') diff --git a/lib/delegate.rb b/lib/delegate.rb index 71aff40f7f..37819a28f4 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -97,7 +97,7 @@ class Delegator < BasicObject target = self.__getobj__ {r = false} r &&= target.respond_to?(m, include_private) if r && include_private && !target.respond_to?(m, false) - warn "#{caller(3, 1)[0]}: delegator does not forward private method \##{m}" + warn "delegator does not forward private method \##{m}", uplevel: 3 return false end r -- cgit v1.2.3