[ruby/uri] Include RFC2396_REGEXP module directly

REGEXP is defined as RFC2396_REGEXP in lib/uri/common.rb. If we include REGEXP then a broken URL is generated in rdoc for URI and URI::MailTo. ruby/uri@ed6ded9c80
ruby · Apr 22, 2022 · eab354e · eab354e
1 parent c94f964
commit eab354e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
@@ -13,6 +13,8 @@
 require_relative "rfc3986_parser"
 
 module URI
+  include RFC2396_REGEXP
+
   REGEXP = RFC2396_REGEXP
   Parser = RFC2396_Parser
   RFC3986_PARSER = RFC3986_Parser.new
@@ -62,8 +64,6 @@ def make_components_hash(klass, array_hash)
     module_function :make_components_hash
   end
 
-  include REGEXP
-
   module Schemes
   end
   private_constant :Schemes

diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
@@ -15,7 +15,7 @@ module URI
   # RFC6068, the mailto URL scheme.
   #
   class MailTo < Generic
-    include REGEXP
+    include RFC2396_REGEXP
 
     # A Default port of nil for URI::MailTo.
     DEFAULT_PORT = nil