mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[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
7c838f7419
This commit is contained in:
parent
14ab281faa
commit
331fe6a88f
Notes:
git
2020-07-31 21:08:24 +09:00
1 changed files with 3 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue