Use cgi/escape instead of cgi/util

Merged: https://github.com/ruby/ruby/pull/13275

lib/bundler/fetcher/dependency.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 require_relative "base"
-require "cgi/util"
+begin
+  require "cgi/escape"
+rescue LoadError
+  require "cgi/util"
+end
 
 module Bundler
   class Fetcher

lib/bundler/friendly_errors.rb

@@ -102,7 +102,11 @@ module Bundler
     def issues_url(exception)
       message = exception.message.lines.first.tr(":", " ").chomp
       message = message.split("-").first if exception.is_a?(Errno)
-      require "cgi/util"
+      begin
+        require "cgi/escape"
+      rescue LoadError
+        require "cgi/util"
+      end
       "https://github.com/rubygems/rubygems/search?q=" \
         "#{CGI.escape(message)}&type=Issues"
     end

lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb

@@ -1,6 +1,11 @@
 require_relative '../../../../../vendored_net_http'
 require_relative '../../../../../vendored_uri'
-require 'cgi' # for escaping
+# for escaping
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 require_relative '../../../../connection_pool/lib/connection_pool'
 
 autoload :OpenSSL, 'openssl'

lib/erb.rb

@@ -12,7 +12,11 @@
 #
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
-require 'cgi/util'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi/util'
+end
 require 'erb/version'
 require 'erb/compiler'
 require 'erb/def_method'

lib/net/http.rb

@@ -1917,7 +1917,11 @@ module Net   #:nodoc:
     private
 
     def unescape(value)
-      require 'cgi/util'
+      begin
+        require "cgi/escape"
+      rescue LoadError
+        require "cgi/util"
+      end
       CGI.unescape(value)
     end
 

lib/rubygems/uri_formatter.rb

@@ -17,7 +17,11 @@ class Gem::UriFormatter
   # Creates a new URI formatter for +uri+.
 
   def initialize(uri)
-    require "cgi/util"
+    begin
+      require "cgi/escape"
+    rescue LoadError
+      require "cgi/util"
+    end
 
     @uri = uri
   end

lib/rubygems/vendor/net-http/lib/net/http.rb

@@ -1923,7 +1923,11 @@ module Gem::Net   #:nodoc:
     private
 
     def unescape(value)
-      require 'cgi/util'
+      begin
+        require "cgi/escape"
+      rescue LoadError
+        require "cgi/util"
+      end
       CGI.unescape(value)
     end
 

prism/templates/lib/prism/dot_visitor.rb.erb

@@ -1,4 +1,8 @@
-require "cgi/util"
+begin
+  require "cgi/escape"
+rescue LoadError
+  require "cgi/util"
+end
 
 module Prism
   # This visitor provides the ability to call Node#to_dot, which converts a