Skip to content

Commit

Permalink
Revert "Reimplement idna on top of ICU4X" (#946)
Browse files Browse the repository at this point in the history
* Revert "Reimplement idna on top of ICU4X (#923)"

This reverts commit 3d6dbbb.

See #937 for reasons behind this backout.

* Bump url version to 2.5.2

* Pin unicode-width to 0.1.12 to avoid build failure in rust 1.56

* Remove ambiguous_wide_pointer_comparisons to maybe resolve clippy error

* fix clippy
  • Loading branch information
valenting authored Jun 18, 2024
1 parent dcfbed3 commit 54346fa
Show file tree
Hide file tree
Showing 22 changed files with 30,444 additions and 8,444 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
rust: [1.67.0, stable, beta, nightly]
rust: [1.56.0, stable, beta, nightly]
exclude:
- os: macos-latest
rust: 1.67.0
rust: 1.56.0
- os: windows-latest
rust: 1.67.0
rust: 1.56.0
- os: macos-latest
rust: beta
- os: windows-latest
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Run debugger_visualizer tests
if: |
matrix.os == 'windows-latest' &&
matrix.rust != '1.67.0'
matrix.rust != '1.56.0'
run: cargo test --test debugger_visualizer --features "url/debugger_visualizer,url_debug_tests/debugger_visualizer" -- --test-threads=1
- name: Test `no_std` support
run: cargo test --no-default-features --features=alloc
Expand Down
1 change: 1 addition & 0 deletions data-url/Cargo.toml
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
18 changes: 6 additions & 12 deletions idna/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
[package]
name = "idna"
version = "1.0.1"
version = "0.5.0"
authors = ["The rust-url developers"]
description = "IDNA (Internationalizing Domain Names in Applications) and Punycode."
categories = ["no_std"]
repository = "https://github.com/servo/rust-url/"
license = "MIT OR Apache-2.0"
autotests = false
edition = "2018"
rust-version = "1.67"
rust-version = "1.51"

[lib]
doctest = false

[features]
default = ["std", "compiled_data"]
std = ["alloc"]
default = ["std"]
std = ["alloc", "unicode-bidi/std", "unicode-normalization/std"]
alloc = []
compiled_data = ["icu_normalizer/compiled_data", "icu_properties/compiled_data"]

[[test]]
name = "tests"
Expand All @@ -26,20 +25,15 @@ harness = false
[[test]]
name = "unit"

[[test]]
name = "unitbis"

[dev-dependencies]
assert_matches = "1.3"
bencher = "0.1"
tester = "0.9"
serde_json = "1.0"

[dependencies]
icu_normalizer = "1.4.3"
icu_properties = "1.4.2"
utf8_iter = "1.0.4"
smallvec = { version = "1.13.1", features = ["const_generics"]}
unicode-bidi = { version = "0.3.10", default-features = false, features = ["hardcoded-data"] }
unicode-normalization = { version = "0.1.22", default-features = false }

[[bench]]
name = "all"
Expand Down
38 changes: 0 additions & 38 deletions idna/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions idna/benches/all.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![allow(deprecated)]

#[macro_use]
extern crate bencher;
extern crate idna;
Expand Down
Loading

0 comments on commit 54346fa

Please sign in to comment.