[rubygems/rubygems] Use vendored timeout from RubyGems

rubygems/rubygems@cfc5018c54

lib/bundler/fetcher.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "vendored_persistent"
+require_relative "vendored_timeout"
 require "cgi"
 require "securerandom"
 require "zlib"
@@ -287,7 +288,7 @@ def gemspec_cached_path(spec_file_name)
     end
 
     HTTP_ERRORS = [
-      Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
+      Gem::Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
       Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
       Gem::Net::HTTPBadResponse, Gem::Net::HTTPHeaderSyntaxError, Gem::Net::ProtocolError,
       Gem::Net::HTTP::Persistent::Error, Zlib::BufError, Errno::EHOSTUNREACH

lib/bundler/vendor/connection_pool/lib/connection_pool.rb

@@ -1,12 +1,12 @@
-require "timeout"
+require_relative "../../../vendored_timeout"
 require_relative "connection_pool/version"
 
 class Bundler::ConnectionPool
   class Error < ::RuntimeError; end
 
   class PoolShuttingDownError < ::Bundler::ConnectionPool::Error; end
 
-  class TimeoutError < ::Timeout::Error; end
+  class TimeoutError < ::Gem::Timeout::Error; end
 end
 
 # Generic connection pool class for sharing a limited number of objects or network connections

lib/bundler/vendored_timeout.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+begin
+  require "rubygems/timeout"
+rescue LoadError
+  require "timeout"
+  Gem::Timeout = Timeout
+end