Prefer require 'cgi/util' instead of require 'cgi'

lib/rdoc/context.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'cgi'
-
 ##
 # A Context is something that can hold modules, classes, methods, attributes,
 # aliases, requires, and includes. Classes, modules, and files are all

lib/rdoc/context/section.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'cgi/util'
+
 ##
 # A section of documentation like:
 #

lib/rdoc/markup/to_html.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'cgi'
+require 'cgi/util'
 
 ##
 # Outputs RDoc markup as HTML.

lib/rdoc/markup/to_label.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'cgi'
+require 'cgi/util'
 
 ##
 # Creates HTML-safe labels suitable for use in id attributes.  Tidylinks are

lib/rdoc/method_attr.rb

@@ -289,7 +289,7 @@ def block_params=(value)
   # HTML id-friendly method/attribute name
 
   def html_name
-    require 'cgi'
+    require 'cgi/util'
 
     CGI.escape(@name.gsub('-', '-2D')).gsub('%','-').sub(/^-/, '')
   end