diff options
Diffstat (limited to 'lib/rubygems')
| -rwxr-xr-x | lib/rubygems/core_ext/kernel_warn.rb | 9 | ||||
| -rw-r--r-- | lib/rubygems/package.rb | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/rubygems/core_ext/kernel_warn.rb b/lib/rubygems/core_ext/kernel_warn.rb index 3e531441ed..6c5b387e88 100755 --- a/lib/rubygems/core_ext/kernel_warn.rb +++ b/lib/rubygems/core_ext/kernel_warn.rb @@ -12,9 +12,9 @@ if RUBY_VERSION >= "2.5" original_warn = method(:warn) - module_function define_method(:warn) {|*messages, uplevel: nil| - unless uplevel - return original_warn.call(*messages) + module_function define_method(:warn) {|*messages, **kw| + unless uplevel = kw[:uplevel] + return original_warn.call(*messages, **kw) end # Ensure `uplevel` fits a `long` @@ -39,7 +39,8 @@ if RUBY_VERSION >= "2.5" end uplevel = start end - original_warn.call(*messages, uplevel: uplevel) + kw[:uplevel] = uplevel + original_warn.call(*messages, **kw) } end end diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index b5f83205b3..49cdf98b31 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -529,11 +529,11 @@ EOM when 'metadata' then @spec = Gem::Specification.from_yaml entry.read when 'metadata.gz' then - args = [entry] - args << { :external_encoding => Encoding::UTF_8 } if + opts = {} + opts[:external_encoding] = Encoding::UTF_8 if Zlib::GzipReader.method(:wrap).arity != 1 - Zlib::GzipReader.wrap(*args) do |gzio| + Zlib::GzipReader.wrap(entry, **opts) do |gzio| @spec = Gem::Specification.from_yaml gzio.read end end |