Skip to content

Commit bcdb1d3

Browse files
authored
Merge pull request #20343 from Homebrew/fix_uri_parser_warning
Fix URI parser warning
2 parents 0df52b9 + 34bc30d commit bcdb1d3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Library/Homebrew/cask/cask_loader.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def self.try_new(ref, warn: false)
181181

182182
# Cache compiled regex
183183
@uri_regex ||= begin
184-
uri_regex = ::URI::DEFAULT_PARSER.make_regexp
184+
uri_regex = ::URI::RFC2396_PARSER.make_regexp
185185
Regexp.new("\\A#{uri_regex.source}\\Z", uri_regex.options)
186186
end
187187

Library/Homebrew/download_strategy.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ def resolved_url_and_basename
366366
def parse_basename(url, search_query: true)
367367
components = { path: T.let([], T::Array[String]), query: T.let([], T::Array[String]) }
368368

369-
if url.match?(URI::DEFAULT_PARSER.make_regexp)
369+
if url.match?(URI::RFC2396_PARSER.make_regexp)
370370
uri = URI(url)
371371

372372
if (uri_query = uri.query.presence)
@@ -382,7 +382,7 @@ def parse_basename(url, search_query: true)
382382

383383
if (uri_path = uri.path.presence)
384384
components[:path] = uri_path.split("/").filter_map do |part|
385-
URI::DEFAULT_PARSER.unescape(part).presence
385+
URI::RFC2396_PARSER.unescape(part).presence
386386
end
387387
end
388388
else

Library/Homebrew/formulary.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ def self.try_new(ref, from: nil, warn: false)
661661

662662
# Cache compiled regex
663663
@uri_regex ||= begin
664-
uri_regex = ::URI::DEFAULT_PARSER.make_regexp
664+
uri_regex = ::URI::RFC2396_PARSER.make_regexp
665665
Regexp.new("\\A#{uri_regex.source}\\Z", uri_regex.options)
666666
end
667667

0 commit comments

Comments
 (0)