diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
| commit | 9918693037dce8aa4bb6f08741b6812923486c18 (patch) | |
| tree | 21d2b40bec7e6a7ea664acee056eb3d08e15a1cf /vendor/url/src | |
| parent | Releasing progress-linux version 1.75.0+dfsg1-5~progress7.99u1. (diff) | |
| download | rustc-9918693037dce8aa4bb6f08741b6812923486c18.tar.xz rustc-9918693037dce8aa4bb6f08741b6812923486c18.zip | |
Merging upstream version 1.76.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/url/src')
| -rw-r--r-- | vendor/url/src/lib.rs | 9 | ||||
| -rw-r--r-- | vendor/url/src/slicing.rs | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/vendor/url/src/lib.rs b/vendor/url/src/lib.rs index 58c7c07cd..b17b82573 100644 --- a/vendor/url/src/lib.rs +++ b/vendor/url/src/lib.rs @@ -134,7 +134,7 @@ url = { version = "2", features = ["debugger_visualizer"] } */ -#![doc(html_root_url = "https://docs.rs/url/2.4.1")] +#![doc(html_root_url = "https://docs.rs/url/2.5.0")] #![cfg_attr( feature = "debugger_visualizer", debugger_visualizer(natvis_file = "../../debug_metadata/url.natvis") @@ -205,6 +205,7 @@ pub struct Url { /// Full configuration for the URL parser. #[derive(Copy, Clone)] +#[must_use] pub struct ParseOptions<'a> { base_url: Option<&'a Url>, encoding_override: EncodingOverride<'a>, @@ -1566,7 +1567,9 @@ impl Url { }); } else { self.query_start = None; - self.strip_trailing_spaces_from_opaque_path(); + if fragment.is_none() { + self.strip_trailing_spaces_from_opaque_path(); + } } self.restore_already_parsed_fragment(fragment); @@ -2697,7 +2700,7 @@ impl Ord for Url { impl PartialOrd for Url { #[inline] fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> { - self.serialization.partial_cmp(&other.serialization) + Some(self.cmp(other)) } } diff --git a/vendor/url/src/slicing.rs b/vendor/url/src/slicing.rs index c061fee84..13829575d 100644 --- a/vendor/url/src/slicing.rs +++ b/vendor/url/src/slicing.rs @@ -93,7 +93,7 @@ fn test_count_digits() { /// /// The end of a component and the start of the next are either the same or separate /// by a delimiter. -/// (Not that the initial `/` of a path is considered part of the path here, not a delimiter.) +/// (Note that the initial `/` of a path is considered part of the path here, not a delimiter.) /// For example, `&url[..BeforeFragment]` would include a `#` delimiter (if present in `url`), /// so `&url[..AfterQuery]` might be desired instead. /// |