Skip to content

Commit b235b56

Browse files
authored
Merge pull request #964 from hsivonen/idna-v1x
Merge main to the idna-v1x branch
2 parents a76fe7e + 77ba6e1 commit b235b56

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

data-url/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ alloc = []
1717

1818
[dev-dependencies]
1919
tester = "0.9"
20+
unicode-width = "=0.1.12"
2021
serde = {version = "1.0", features = ["derive"]}
2122
serde_json = "1.0"
2223

percent_encoding/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ impl<'a> PercentDecode<'a> {
449449

450450
// std::ptr::addr_eq was stabilized in rust 1.76. Once we upgrade
451451
// the MSRV we can remove this lint override.
452-
#[allow(ambiguous_wide_pointer_comparisons)]
453452
#[cfg(feature = "alloc")]
453+
#[allow(ambiguous_wide_pointer_comparisons)]
454454
fn decode_utf8_lossy(input: Cow<'_, [u8]>) -> Cow<'_, str> {
455455
// Note: This function is duplicated in `form_urlencoded/src/query_encoding.rs`.
456456
match input {

url/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
name = "url"
44
# When updating version, also modify html_root_url in the lib.rs
5-
version = "2.5.1"
5+
version = "2.5.2"
66
authors = ["The rust-url developers"]
77

88
description = "URL library for Rust, based on the WHATWG URL Standard"
@@ -14,7 +14,7 @@ categories = ["parser-implementations", "web-programming", "encoding"]
1414
license = "MIT OR Apache-2.0"
1515
include = ["src/**/*", "LICENSE-*", "README.md", "tests/**"]
1616
edition = "2018"
17-
rust-version = "1.67"
17+
rust-version = "1.56"
1818

1919
[dev-dependencies]
2020
serde = { version = "1.0", features = ["derive"] }
@@ -26,7 +26,7 @@ wasm-bindgen-test = "0.3"
2626

2727
[dependencies]
2828
form_urlencoded = { version = "1.2.1", path = "../form_urlencoded" }
29-
idna = { version = "1.0.0", path = "../idna" }
29+
idna = { version = "1.0.2", path = "../idna" }
3030
percent-encoding = { version = "2.3.1", path = "../percent_encoding" }
3131
serde = { version = "1.0", optional = true, features = ["derive"] }
3232

url/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ url = { version = "2", features = ["debugger_visualizer"] }
134134
135135
*/
136136

137-
#![doc(html_root_url = "https://docs.rs/url/2.5.1")]
137+
#![doc(html_root_url = "https://docs.rs/url/2.5.2")]
138138
#![cfg_attr(
139139
feature = "debugger_visualizer",
140140
debugger_visualizer(natvis_file = "../../debug_metadata/url.natvis")

0 commit comments

Comments
 (0)