ruby-changes:71249
From: Yusuke <ko1@a...>
Date: Tue, 22 Feb 2022 17:09:12 +0900 (JST)
Subject: [ruby-changes:71249] ae8a8b184e (master): [ruby/rdoc] Prefer `require 'cgi/util'` instead of `require 'cgi'`
https://git.ruby-lang.org/ruby.git/commit/?id=ae8a8b184e From ae8a8b184e6d7400470669ed7557842902019d36 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh <mame@r...> Date: Sun, 20 Feb 2022 20:45:53 +0900 Subject: [ruby/rdoc] Prefer `require 'cgi/util'` instead of `require 'cgi'` RDoc is using only CGI.escape, escapeHTML, and unescape. We don't have to load the whole source code of cgi gem. https://github.com/ruby/rdoc/commit/d096222cc2 --- lib/rdoc/context.rb | 2 -- lib/rdoc/context/section.rb | 2 ++ lib/rdoc/markup/to_html.rb | 2 +- lib/rdoc/markup/to_label.rb | 2 +- lib/rdoc/method_attr.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb index 8e15697034..c6edfb473c 100644 --- a/lib/rdoc/context.rb +++ b/lib/rdoc/context.rb @@ -1,6 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/lib/rdoc/context.rb#L1 # 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 diff --git a/lib/rdoc/context/section.rb b/lib/rdoc/context/section.rb index 5fef4a9ffc..c316efe99f 100644 --- a/lib/rdoc/context/section.rb +++ b/lib/rdoc/context/section.rb @@ -1,4 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rdoc/context/section.rb#L1 # frozen_string_literal: true +require 'cgi/util' + ## # A section of documentation like: # diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb index d3bb8af835..7c2e91cecf 100644 --- a/lib/rdoc/markup/to_html.rb +++ b/lib/rdoc/markup/to_html.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markup/to_html.rb#L1 # frozen_string_literal: true -require 'cgi' +require 'cgi/util' ## # Outputs RDoc markup as HTML. diff --git a/lib/rdoc/markup/to_label.rb b/lib/rdoc/markup/to_label.rb index 3d95ccc2e2..aa1dbcf2a1 100644 --- a/lib/rdoc/markup/to_label.rb +++ b/lib/rdoc/markup/to_label.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markup/to_label.rb#L1 # frozen_string_literal: true -require 'cgi' +require 'cgi/util' ## # Creates HTML-safe labels suitable for use in id attributes. Tidylinks are diff --git a/lib/rdoc/method_attr.rb b/lib/rdoc/method_attr.rb index 3cef78c4a5..aae3c47e85 100644 --- a/lib/rdoc/method_attr.rb +++ b/lib/rdoc/method_attr.rb @@ -289,7 +289,7 @@ class RDoc::MethodAttr < RDoc::CodeObject https://github.com/ruby/ruby/blob/trunk/lib/rdoc/method_attr.rb#L289 # HTML id-friendly method/attribute name def html_name - require 'cgi' + require 'cgi/util' CGI.escape(@name.gsub('-', '-2D')).gsub('%','-').sub(/^-/, '') end -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/