Postponing the Bundler merge.

  I faced a big issue about Bundler with ruby core.
  I have no time to resolve it issue before 2.5 final release.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 0 insertions, 37 deletions

diff --git a/lib/bundler/psyched_yaml.rb b/lib/bundler/psyched_yaml.rb
deleted file mode 100644
index e654416a5a..0000000000
--- a/lib/bundler/psyched_yaml.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-# Psych could be a gem, so try to ask for it
-begin
-  gem "psych"
-rescue LoadError
-end if defined?(gem)
-
-# Psych could be in the stdlib
-# but it's too late if Syck is already loaded
-begin
-  require "psych" unless defined?(Syck)
-rescue LoadError
-  # Apparently Psych wasn't available. Oh well.
-end
-
-# At least load the YAML stdlib, whatever that may be
-require "yaml" unless defined?(YAML.dump)
-
-module Bundler
-  # On encountering invalid YAML,
-  # Psych raises Psych::SyntaxError
-  if defined?(::Psych::SyntaxError)
-    YamlLibrarySyntaxError = ::Psych::SyntaxError
-  else # Syck raises ArgumentError
-    YamlLibrarySyntaxError = ::ArgumentError
-  end
-end
-
-require "bundler/deprecate"
-begin
-  Bundler::Deprecate.skip_during do
-    require "rubygems/safe_yaml"
-  end
-rescue LoadError
-  # it's OK if the file isn't there
-end