Skip to content

Commit ffffc20

Browse files
committed
Update ICU4X
This updates all ICU4X crates and regenerates rustc_baked_icu_data. Since the new unicode license under which they are licensed does not have an SPDX identifier yet, we define some exceptions. The license has to be reviewed to make sure it is still fine to use here, but I assume that is the case. I also added an exception for rustc_icu_data to the unexplained ignore doctest tidy lint. This is a bit hacky but the whole style.rs in tidy is a mess so I didn't want to touch it more than this small hack.
1 parent 6bf2fb3 commit ffffc20

31 files changed

+286
-898
lines changed

Diff for: Cargo.lock

+52-22
Original file line numberDiff line numberDiff line change
@@ -1890,21 +1890,29 @@ dependencies = [
18901890

18911891
[[package]]
18921892
name = "icu_list"
1893-
version = "1.2.0"
1893+
version = "1.3.2"
18941894
source = "registry+https://github.com/rust-lang/crates.io-index"
1895-
checksum = "fd7ba7442d9235b689d4fdce17c452ea229934980fd81ba50cc28275752c9f90"
1895+
checksum = "dc1a44bbed77a7e7b555f9d7dd4b43f75ec1402b438a901d20451943d50cbd90"
18961896
dependencies = [
18971897
"displaydoc",
1898+
"icu_list_data",
1899+
"icu_locid_transform",
18981900
"icu_provider",
18991901
"regex-automata 0.2.0",
19001902
"writeable",
19011903
]
19021904

1905+
[[package]]
1906+
name = "icu_list_data"
1907+
version = "1.3.2"
1908+
source = "registry+https://github.com/rust-lang/crates.io-index"
1909+
checksum = "d3237583f0cb7feafabb567c4492fe9ef1d2d4113f6a8798a923273ea5de996d"
1910+
19031911
[[package]]
19041912
name = "icu_locid"
1905-
version = "1.2.0"
1913+
version = "1.3.2"
19061914
source = "registry+https://github.com/rust-lang/crates.io-index"
1907-
checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335"
1915+
checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c"
19081916
dependencies = [
19091917
"displaydoc",
19101918
"litemap",
@@ -1913,16 +1921,37 @@ dependencies = [
19131921
"zerovec",
19141922
]
19151923

1924+
[[package]]
1925+
name = "icu_locid_transform"
1926+
version = "1.3.2"
1927+
source = "registry+https://github.com/rust-lang/crates.io-index"
1928+
checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7"
1929+
dependencies = [
1930+
"displaydoc",
1931+
"icu_locid",
1932+
"icu_locid_transform_data",
1933+
"icu_provider",
1934+
"tinystr",
1935+
"zerovec",
1936+
]
1937+
1938+
[[package]]
1939+
name = "icu_locid_transform_data"
1940+
version = "1.3.2"
1941+
source = "registry+https://github.com/rust-lang/crates.io-index"
1942+
checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44"
1943+
19161944
[[package]]
19171945
name = "icu_provider"
1918-
version = "1.2.0"
1946+
version = "1.3.2"
19191947
source = "registry+https://github.com/rust-lang/crates.io-index"
1920-
checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305"
1948+
checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934"
19211949
dependencies = [
19221950
"displaydoc",
19231951
"icu_locid",
19241952
"icu_provider_macros",
19251953
"stable_deref_trait",
1954+
"tinystr",
19261955
"writeable",
19271956
"yoke",
19281957
"zerofrom",
@@ -1931,26 +1960,26 @@ dependencies = [
19311960

19321961
[[package]]
19331962
name = "icu_provider_adapters"
1934-
version = "1.2.0"
1963+
version = "1.3.2"
19351964
source = "registry+https://github.com/rust-lang/crates.io-index"
1936-
checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3"
1965+
checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d"
19371966
dependencies = [
19381967
"icu_locid",
1968+
"icu_locid_transform",
19391969
"icu_provider",
19401970
"tinystr",
1941-
"yoke",
19421971
"zerovec",
19431972
]
19441973

19451974
[[package]]
19461975
name = "icu_provider_macros"
1947-
version = "1.2.0"
1976+
version = "1.3.2"
19481977
source = "registry+https://github.com/rust-lang/crates.io-index"
1949-
checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"
1978+
checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99"
19501979
dependencies = [
19511980
"proc-macro2",
19521981
"quote",
1953-
"syn 1.0.109",
1982+
"syn 2.0.29",
19541983
]
19551984

19561985
[[package]]
@@ -2310,9 +2339,9 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
23102339

23112340
[[package]]
23122341
name = "litemap"
2313-
version = "0.7.0"
2342+
version = "0.7.1"
23142343
source = "registry+https://github.com/rust-lang/crates.io-index"
2315-
checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94"
2344+
checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1"
23162345

23172346
[[package]]
23182347
name = "lld-wrapper"
@@ -3558,6 +3587,7 @@ version = "0.0.0"
35583587
dependencies = [
35593588
"icu_list",
35603589
"icu_locid",
3590+
"icu_locid_transform",
35613591
"icu_provider",
35623592
"icu_provider_adapters",
35633593
"zerovec",
@@ -5498,9 +5528,9 @@ dependencies = [
54985528

54995529
[[package]]
55005530
name = "tinystr"
5501-
version = "0.7.1"
5531+
version = "0.7.4"
55025532
source = "registry+https://github.com/rust-lang/crates.io-index"
5503-
checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"
5533+
checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219"
55045534
dependencies = [
55055535
"displaydoc",
55065536
"zerovec",
@@ -6296,9 +6326,9 @@ dependencies = [
62966326

62976327
[[package]]
62986328
name = "writeable"
6299-
version = "0.5.2"
6329+
version = "0.5.3"
63006330
source = "registry+https://github.com/rust-lang/crates.io-index"
6301-
checksum = "60e49e42bdb1d5dc76f4cd78102f8f0714d32edfa3efb82286eb0f0b1fc0da0f"
6331+
checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2"
63026332

63036333
[[package]]
63046334
name = "xattr"
@@ -6358,9 +6388,9 @@ dependencies = [
63586388

63596389
[[package]]
63606390
name = "yoke"
6361-
version = "0.7.1"
6391+
version = "0.7.2"
63626392
source = "registry+https://github.com/rust-lang/crates.io-index"
6363-
checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de"
6393+
checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4"
63646394
dependencies = [
63656395
"serde",
63666396
"stable_deref_trait",
@@ -6403,9 +6433,9 @@ dependencies = [
64036433

64046434
[[package]]
64056435
name = "zerovec"
6406-
version = "0.9.4"
6436+
version = "0.10.0"
64076437
source = "registry+https://github.com/rust-lang/crates.io-index"
6408-
checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea"
6438+
checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e"
64096439
dependencies = [
64106440
"yoke",
64116441
"zerofrom",

Diff for: compiler/rustc_baked_icu_data/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ edition = "2021"
77
# tidy-alphabetical-start
88
icu_list = "1.2"
99
icu_locid = "1.2"
10+
icu_locid_transform = "1.3.2"
1011
icu_provider = "1.2"
1112
icu_provider_adapters = "1.2"
12-
zerovec = "0.9.4"
13+
zerovec = "0.10.0"
1314
# tidy-alphabetical-end
1415

1516
[features]

Diff for: compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1/mod.rs

-6
This file was deleted.

Diff for: compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1/und.rs.data

-66
This file was deleted.

Diff for: compiler/rustc_baked_icu_data/src/data/fallback/mod.rs

-4
This file was deleted.

Diff for: compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/mod.rs

-6
This file was deleted.

Diff for: compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/und.rs.data

-13
This file was deleted.

Diff for: compiler/rustc_baked_icu_data/src/data/fallback/supplement/co_v1/mod.rs

-6
This file was deleted.

Diff for: compiler/rustc_baked_icu_data/src/data/fallback/supplement/co_v1/und.rs.data

-22
This file was deleted.

Diff for: compiler/rustc_baked_icu_data/src/data/fallback/supplement/mod.rs

-2
This file was deleted.

Diff for: compiler/rustc_baked_icu_data/src/data/list/and_v1/en.rs.data

-50
This file was deleted.

0 commit comments

Comments
 (0)