Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to the idna-v1x branch #964

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Merge main to the idna-v1x branch #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54346fa
Revert "Reimplement idna on top of ICU4X" (#946)
valenting Jun 18, 2024
77ba6e1
Merge branch 'main' into idna-v1x
hsivonen Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data-url/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ alloc = []

[dev-dependencies]
tester = "0.9"
unicode-width = "=0.1.12"
serde = {version = "1.0", features = ["derive"]}
serde_json = "1.0"

Expand Down
2 changes: 1 addition & 1 deletion percent_encoding/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ impl<'a> PercentDecode<'a> {

// std::ptr::addr_eq was stabilized in rust 1.76. Once we upgrade
// the MSRV we can remove this lint override.
#[allow(ambiguous_wide_pointer_comparisons)]
#[cfg(feature = "alloc")]
#[allow(ambiguous_wide_pointer_comparisons)]
fn decode_utf8_lossy(input: Cow<'_, [u8]>) -> Cow<'_, str> {
// Note: This function is duplicated in `form_urlencoded/src/query_encoding.rs`.
match input {
Expand Down
6 changes: 3 additions & 3 deletions url/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion url/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ url = { version = "2", features = ["debugger_visualizer"] }

*/

#![doc(html_root_url = "https://docs.rs/url/2.5.1")]
#![doc(html_root_url = "https://docs.rs/url/2.5.2")]
#![cfg_attr(
feature = "debugger_visualizer",
debugger_visualizer(natvis_file = "../../debug_metadata/url.natvis")
Expand Down
Loading