diff options
author | Peter Zhu <peter@peterzhu.ca> | 2022-04-14 14:02:00 -0400 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2022-04-22 12:00:14 +0900 |
commit | eab354e17b4bc21d0142564ce71ebadf4ad8486a (patch) | |
tree | 0edefc7ff33f2f2f52e8d9e9037b5bfd4f5ad51f /lib/uri | |
parent | c94f964e3f94e9f934a3f4e73fb55f5fd2a21f08 (diff) |
[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.
https://github.com/ruby/uri/commit/ed6ded9c80
Diffstat (limited to 'lib/uri')
-rw-r--r-- | lib/uri/common.rb | 4 | ||||
-rw-r--r-- | lib/uri/mailto.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/uri/common.rb b/lib/uri/common.rb index 26b179add2..d592fdc9ba 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -13,6 +13,8 @@ require_relative "rfc2396_parser" require_relative "rfc3986_parser" module URI + include RFC2396_REGEXP + REGEXP = RFC2396_REGEXP Parser = RFC2396_Parser RFC3986_PARSER = RFC3986_Parser.new @@ -62,8 +64,6 @@ module URI 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 index 87cb99656f..cb8024f301 100644 --- 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 |