Skip to content

Commit 54346fa

Browse files
authored
Revert "Reimplement idna on top of ICU4X" (#946)
* 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
1 parent dcfbed3 commit 54346fa

22 files changed

+30444
-8444
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ubuntu-latest, macos-latest, windows-latest]
18-
rust: [1.67.0, stable, beta, nightly]
18+
rust: [1.56.0, stable, beta, nightly]
1919
exclude:
2020
- os: macos-latest
21-
rust: 1.67.0
21+
rust: 1.56.0
2222
- os: windows-latest
23-
rust: 1.67.0
23+
rust: 1.56.0
2424
- os: macos-latest
2525
rust: beta
2626
- os: windows-latest
@@ -47,7 +47,7 @@ jobs:
4747
- name: Run debugger_visualizer tests
4848
if: |
4949
matrix.os == 'windows-latest' &&
50-
matrix.rust != '1.67.0'
50+
matrix.rust != '1.56.0'
5151
run: cargo test --test debugger_visualizer --features "url/debugger_visualizer,url_debug_tests/debugger_visualizer" -- --test-threads=1
5252
- name: Test `no_std` support
5353
run: cargo test --no-default-features --features=alloc

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

idna/Cargo.toml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
[package]
22
name = "idna"
3-
version = "1.0.1"
3+
version = "0.5.0"
44
authors = ["The rust-url developers"]
55
description = "IDNA (Internationalizing Domain Names in Applications) and Punycode."
66
categories = ["no_std"]
77
repository = "https://github.com/servo/rust-url/"
88
license = "MIT OR Apache-2.0"
99
autotests = false
1010
edition = "2018"
11-
rust-version = "1.67"
11+
rust-version = "1.51"
1212

1313
[lib]
1414
doctest = false
1515

1616
[features]
17-
default = ["std", "compiled_data"]
18-
std = ["alloc"]
17+
default = ["std"]
18+
std = ["alloc", "unicode-bidi/std", "unicode-normalization/std"]
1919
alloc = []
20-
compiled_data = ["icu_normalizer/compiled_data", "icu_properties/compiled_data"]
2120

2221
[[test]]
2322
name = "tests"
@@ -26,20 +25,15 @@ harness = false
2625
[[test]]
2726
name = "unit"
2827

29-
[[test]]
30-
name = "unitbis"
31-
3228
[dev-dependencies]
3329
assert_matches = "1.3"
3430
bencher = "0.1"
3531
tester = "0.9"
3632
serde_json = "1.0"
3733

3834
[dependencies]
39-
icu_normalizer = "1.4.3"
40-
icu_properties = "1.4.2"
41-
utf8_iter = "1.0.4"
42-
smallvec = { version = "1.13.1", features = ["const_generics"]}
35+
unicode-bidi = { version = "0.3.10", default-features = false, features = ["hardcoded-data"] }
36+
unicode-normalization = { version = "0.1.22", default-features = false }
4337

4438
[[bench]]
4539
name = "all"

idna/README.md

Lines changed: 0 additions & 38 deletions
This file was deleted.

idna/benches/all.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![allow(deprecated)]
2-
31
#[macro_use]
42
extern crate bencher;
53
extern crate idna;

0 commit comments

Comments
 (0)