Skip to content

Commit 9d85dfc

Browse files
clubby789clubby789
committed
Update icu4x dependencies
1 parent cfdb617 commit 9d85dfc

File tree

3 files changed

+37
-66
lines changed

3 files changed

+37
-66
lines changed

‎Cargo.lock

+34-34
Original file line numberDiff line numberDiff line change
@@ -1800,9 +1800,9 @@ dependencies = [
18001800

18011801
[[package]]
18021802
name = "icu_list"
1803-
version = "1.4.0"
1803+
version = "1.5.0"
18041804
source = "registry+https://github.com/rust-lang/crates.io-index"
1805-
checksum = "fe6c04ec71ad1bacdbfb47164d4801f80a0533d9340f94f1a880f521eff59f54"
1805+
checksum = "bbfeda1d7775b6548edd4e8b7562304a559a91ed56ab56e18961a053f367c365"
18061806
dependencies = [
18071807
"displaydoc",
18081808
"icu_list_data",
@@ -1814,15 +1814,15 @@ dependencies = [
18141814

18151815
[[package]]
18161816
name = "icu_list_data"
1817-
version = "1.4.0"
1817+
version = "1.5.0"
18181818
source = "registry+https://github.com/rust-lang/crates.io-index"
1819-
checksum = "42f6afcf7a9a7fedece70b7f17d7a7ecdfb8df145d37ae46d0277cd1e3932532"
1819+
checksum = "e1825170d2c6679cb20dbd96a589d034e49f698aed9a2ef4fafc9a0101ed298f"
18201820

18211821
[[package]]
18221822
name = "icu_locid"
1823-
version = "1.4.0"
1823+
version = "1.5.0"
18241824
source = "registry+https://github.com/rust-lang/crates.io-index"
1825-
checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d"
1825+
checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
18261826
dependencies = [
18271827
"displaydoc",
18281828
"litemap",
@@ -1833,9 +1833,9 @@ dependencies = [
18331833

18341834
[[package]]
18351835
name = "icu_locid_transform"
1836-
version = "1.4.0"
1836+
version = "1.5.0"
18371837
source = "registry+https://github.com/rust-lang/crates.io-index"
1838-
checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a"
1838+
checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
18391839
dependencies = [
18401840
"displaydoc",
18411841
"icu_locid",
@@ -1847,15 +1847,15 @@ dependencies = [
18471847

18481848
[[package]]
18491849
name = "icu_locid_transform_data"
1850-
version = "1.4.0"
1850+
version = "1.5.0"
18511851
source = "registry+https://github.com/rust-lang/crates.io-index"
1852-
checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc"
1852+
checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
18531853

18541854
[[package]]
18551855
name = "icu_provider"
1856-
version = "1.4.0"
1856+
version = "1.5.0"
18571857
source = "registry+https://github.com/rust-lang/crates.io-index"
1858-
checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4"
1858+
checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
18591859
dependencies = [
18601860
"displaydoc",
18611861
"icu_locid",
@@ -1870,9 +1870,9 @@ dependencies = [
18701870

18711871
[[package]]
18721872
name = "icu_provider_adapters"
1873-
version = "1.4.0"
1873+
version = "1.5.0"
18741874
source = "registry+https://github.com/rust-lang/crates.io-index"
1875-
checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd"
1875+
checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc"
18761876
dependencies = [
18771877
"icu_locid",
18781878
"icu_locid_transform",
@@ -1883,9 +1883,9 @@ dependencies = [
18831883

18841884
[[package]]
18851885
name = "icu_provider_macros"
1886-
version = "1.4.0"
1886+
version = "1.5.0"
18871887
source = "registry+https://github.com/rust-lang/crates.io-index"
1888-
checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a"
1888+
checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
18891889
dependencies = [
18901890
"proc-macro2",
18911891
"quote",
@@ -2252,9 +2252,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
22522252

22532253
[[package]]
22542254
name = "litemap"
2255-
version = "0.7.2"
2255+
version = "0.7.3"
22562256
source = "registry+https://github.com/rust-lang/crates.io-index"
2257-
checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da"
2257+
checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
22582258

22592259
[[package]]
22602260
name = "lld-wrapper"
@@ -5744,9 +5744,9 @@ dependencies = [
57445744

57455745
[[package]]
57465746
name = "tinystr"
5747-
version = "0.7.5"
5747+
version = "0.7.6"
57485748
source = "registry+https://github.com/rust-lang/crates.io-index"
5749-
checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece"
5749+
checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
57505750
dependencies = [
57515751
"displaydoc",
57525752
"zerovec",
@@ -6585,9 +6585,9 @@ dependencies = [
65856585

65866586
[[package]]
65876587
name = "writeable"
6588-
version = "0.5.4"
6588+
version = "0.5.5"
65896589
source = "registry+https://github.com/rust-lang/crates.io-index"
6590-
checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e"
6590+
checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
65916591

65926592
[[package]]
65936593
name = "xattr"
@@ -6635,9 +6635,9 @@ dependencies = [
66356635

66366636
[[package]]
66376637
name = "yoke"
6638-
version = "0.7.3"
6638+
version = "0.7.4"
66396639
source = "registry+https://github.com/rust-lang/crates.io-index"
6640-
checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4"
6640+
checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
66416641
dependencies = [
66426642
"serde",
66436643
"stable_deref_trait",
@@ -6647,9 +6647,9 @@ dependencies = [
66476647

66486648
[[package]]
66496649
name = "yoke-derive"
6650-
version = "0.7.3"
6650+
version = "0.7.4"
66516651
source = "registry+https://github.com/rust-lang/crates.io-index"
6652-
checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8"
6652+
checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
66536653
dependencies = [
66546654
"proc-macro2",
66556655
"quote",
@@ -6679,18 +6679,18 @@ dependencies = [
66796679

66806680
[[package]]
66816681
name = "zerofrom"
6682-
version = "0.1.3"
6682+
version = "0.1.4"
66836683
source = "registry+https://github.com/rust-lang/crates.io-index"
6684-
checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7"
6684+
checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
66856685
dependencies = [
66866686
"zerofrom-derive",
66876687
]
66886688

66896689
[[package]]
66906690
name = "zerofrom-derive"
6691-
version = "0.1.3"
6691+
version = "0.1.4"
66926692
source = "registry+https://github.com/rust-lang/crates.io-index"
6693-
checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3"
6693+
checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
66946694
dependencies = [
66956695
"proc-macro2",
66966696
"quote",
@@ -6700,9 +6700,9 @@ dependencies = [
67006700

67016701
[[package]]
67026702
name = "zerovec"
6703-
version = "0.10.1"
6703+
version = "0.10.2"
67046704
source = "registry+https://github.com/rust-lang/crates.io-index"
6705-
checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea"
6705+
checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
67066706
dependencies = [
67076707
"yoke",
67086708
"zerofrom",
@@ -6711,9 +6711,9 @@ dependencies = [
67116711

67126712
[[package]]
67136713
name = "zerovec-derive"
6714-
version = "0.10.1"
6714+
version = "0.10.2"
67156715
source = "registry+https://github.com/rust-lang/crates.io-index"
6716-
checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20"
6716+
checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
67176717
dependencies = [
67186718
"proc-macro2",
67196719
"quote",

‎src/tools/clippy/tests/ui/unicode.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error: invisible character detected
1111
--> tests/ui/unicode.rs:7:12
1212
|
1313
LL | print!("Here >­< is a SHY, and ­another");
14-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider replacing the string with: `"Here >\u{AD}< is a SHY, and \u{AD}another"`
14+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider replacing the string with: `"Here >\u{AD}< is a SHY, and \u{AD}another"`
1515

1616
error: invisible character detected
1717
--> tests/ui/unicode.rs:9:12

‎src/tools/tidy/src/deps.rs

+2-31
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ const LICENSES: &[&str] = &[
2727
"MIT OR Zlib OR Apache-2.0", // miniz_oxide
2828
"MIT",
2929
"MIT/Apache-2.0",
30-
"Unicode-DFS-2016", // tinystr and icu4x
30+
"Unicode-3.0", // icu4x
31+
"Unicode-DFS-2016", // tinystr
3132
"Unlicense OR MIT",
3233
"Unlicense/MIT",
3334
"Zlib OR Apache-2.0 OR MIT", // tinyvec
@@ -411,32 +412,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
411412
// tidy-alphabetical-end
412413
];
413414

414-
// These crates come from ICU4X and are licensed under the unicode license.
415-
// It currently doesn't have an SPDX identifier, so they cannot put one there.
416-
// See https://github.com/unicode-org/icu4x/pull/3875
417-
// FIXME: This should be removed once ICU4X crates update.
418-
const ICU4X_UNICODE_LICENSE_DEPENDENCIES: &[&str] = &[
419-
// tidy-alphabetical-start
420-
"icu_list",
421-
"icu_list_data",
422-
"icu_locid",
423-
"icu_locid_transform",
424-
"icu_locid_transform_data",
425-
"icu_provider",
426-
"icu_provider_adapters",
427-
"icu_provider_macros",
428-
"litemap",
429-
"tinystr",
430-
"writeable",
431-
"yoke",
432-
"yoke-derive",
433-
"zerofrom",
434-
"zerofrom-derive",
435-
"zerovec",
436-
"zerovec-derive",
437-
// tidy-alphabetical-end
438-
];
439-
440415
const PERMITTED_CRANELIFT_DEPENDENCIES: &[&str] = &[
441416
// tidy-alphabetical-start
442417
"ahash",
@@ -642,10 +617,6 @@ fn check_license_exceptions(metadata: &Metadata, exceptions: &[(&str, &str)], ba
642617
let license = match &pkg.license {
643618
Some(license) => license,
644619
None => {
645-
if ICU4X_UNICODE_LICENSE_DEPENDENCIES.contains(&pkg.name.as_str()) {
646-
// See the comment on ICU4X_UNICODE_LICENSE_DEPENDENCIES.
647-
continue;
648-
}
649620
tidy_error!(bad, "dependency `{}` does not define a license expression", pkg.id);
650621
continue;
651622
}

0 commit comments

Comments
 (0)