diff options
author | Benoit Daloze <eregontp@gmail.com> | 2020-07-10 21:51:45 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-07-31 21:07:19 +0900 |
commit | 331fe6a88f96d9f986da55e003e896c2bc181db0 (patch) | |
tree | 519eafe76f280b7bbdd22892ae2af7ea67737ef4 /lib | |
parent | 14ab281faa7f740afd41ce4b43b00edb73eff990 (diff) |
[rubygems/rubygems] Ignore internal frames in RubyGems' Kernel#warn
* See https://github.com/oracle/truffleruby/issues/2046
* `<internal:` is a common prefix also used by core Ruby files in CRuby.
* test_no_kernel_require_in_*warn_with_uplevel already test this.
* Unfortunately just skipping `<internal:` in the Ruby implementation
is not enough, because RubyGems' #warn would not skip the
`<internal:` require (TruffleRuby defines #require in Ruby),
and the Ruby implementation's #warn would not skip
RubyGems's #require. The #caller_locations(0) look like this:
warnee.rb:1:in `<top (required)>' # where #warn is called
<internal:core> core/kernel.rb:234:in `gem_original_require' # not skipped by RubyGems' warn, skipped by the Ruby impl
rubygems/core_ext/kernel_require.rb:54:in `require' # not skipped by the Ruby impl's warn, what would be shown without this fix
warn.rb:1:in `<main>' # what would be correct
warn.rb is
require "warnee"
warnee.rb is
puts caller_locations(0), nil
warn "oops", uplevel: 1
https://github.com/rubygems/rubygems/commit/7c838f7419
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3379
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rubygems/core_ext/kernel_warn.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/rubygems/core_ext/kernel_warn.rb b/lib/rubygems/core_ext/kernel_warn.rb index 8b73902d3b..e10a845b98 100644 --- a/lib/rubygems/core_ext/kernel_warn.rb +++ b/lib/rubygems/core_ext/kernel_warn.rb @@ -4,7 +4,7 @@ if RUBY_VERSION >= "2.5" module Kernel - path = "#{__dir__}/" # Frames to be skipped start with this path. + rubygems_path = "#{__dir__}/" # Frames to be skipped start with this path. original_warn = method(:warn) @@ -38,7 +38,8 @@ if RUBY_VERSION >= "2.5" start += 1 - unless loc.path.start_with?(path) + path = loc.path + unless path.start_with?(rubygems_path) or path.start_with?('<internal:') # Non-rubygems frames uplevel -= 1 end |