summaryrefslogtreecommitdiff
path: root/lib/rubygems.rb
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2020-05-18 20:14:36 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-06-05 07:32:42 +0900
commit28be8e04805170607656dd218f3164611d5cdd74 (patch)
treea99614854ff460d2a40835ed037f9ce94d7b7717 /lib/rubygems.rb
parent459eb684b7a90e11ba5812ce9bb518f4940d3519 (diff)
[rubygems/rubygems] Remove explicit `psych` activation
We don't need to explictly activate `psych` since `require` will take care of that automatically. We don't need to care about a minimum version either since the oldest ruby we support at the moment ships with a `psych` version higher than 2.0.0. https://github.com/rubygems/rubygems/commit/1ccf0912a1
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3184
Diffstat (limited to 'lib/rubygems.rb')
-rw-r--r--lib/rubygems.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index dbb32b2..ef744c4 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -618,13 +618,6 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
return unless defined?(gem)
begin
- gem 'psych', '>= 2.0.0'
- rescue Gem::LoadError
- # It's OK if the user does not have the psych gem installed. We will
- # attempt to require the stdlib version
- end
-
- begin
# Try requiring the gem version *or* stdlib version of psych.
require 'psych'
rescue ::LoadError