Merge branch 'servo:main' into main

.github/workflows/main.yml

@@ -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
@@ -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

data-url/Cargo.toml

@@ -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"
 

idna/Cargo.toml

@@ -1,23 +1,22 @@
 [package]
 name = "idna"
-version = "1.0.0"
+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"
@@ -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"

idna/benches/all.rs

@@ -1,5 +1,3 @@
-#![allow(deprecated)]
-
 #[macro_use]
 extern crate bencher;
 extern crate idna;