Skip to content

Commit 287ae4d

Browse files
borsbors
committed
Auto merge of #117632 - Nilstrieb:icup, r=davidtwco
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. part of #112865 r? `@davidtwco` `@wesleywiser` `@Manishearth`
2 parents 492e57c + ffffc20 commit 287ae4d

31 files changed

+286
-898
lines changed

‎Cargo.lock

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

18801880
[[package]]
18811881
name = "icu_list"
1882-
version = "1.2.0"
1882+
version = "1.3.2"
18831883
source = "registry+https://github.com/rust-lang/crates.io-index"
1884-
checksum = "fd7ba7442d9235b689d4fdce17c452ea229934980fd81ba50cc28275752c9f90"
1884+
checksum = "dc1a44bbed77a7e7b555f9d7dd4b43f75ec1402b438a901d20451943d50cbd90"
18851885
dependencies = [
18861886
"displaydoc",
1887+
"icu_list_data",
1888+
"icu_locid_transform",
18871889
"icu_provider",
18881890
"regex-automata 0.2.0",
18891891
"writeable",
18901892
]
18911893

1894+
[[package]]
1895+
name = "icu_list_data"
1896+
version = "1.3.2"
1897+
source = "registry+https://github.com/rust-lang/crates.io-index"
1898+
checksum = "d3237583f0cb7feafabb567c4492fe9ef1d2d4113f6a8798a923273ea5de996d"
1899+
18921900
[[package]]
18931901
name = "icu_locid"
1894-
version = "1.2.0"
1902+
version = "1.3.2"
18951903
source = "registry+https://github.com/rust-lang/crates.io-index"
1896-
checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335"
1904+
checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c"
18971905
dependencies = [
18981906
"displaydoc",
18991907
"litemap",
@@ -1902,16 +1910,37 @@ dependencies = [
19021910
"zerovec",
19031911
]
19041912

1913+
[[package]]
1914+
name = "icu_locid_transform"
1915+
version = "1.3.2"
1916+
source = "registry+https://github.com/rust-lang/crates.io-index"
1917+
checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7"
1918+
dependencies = [
1919+
"displaydoc",
1920+
"icu_locid",
1921+
"icu_locid_transform_data",
1922+
"icu_provider",
1923+
"tinystr",
1924+
"zerovec",
1925+
]
1926+
1927+
[[package]]
1928+
name = "icu_locid_transform_data"
1929+
version = "1.3.2"
1930+
source = "registry+https://github.com/rust-lang/crates.io-index"
1931+
checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44"
1932+
19051933
[[package]]
19061934
name = "icu_provider"
1907-
version = "1.2.0"
1935+
version = "1.3.2"
19081936
source = "registry+https://github.com/rust-lang/crates.io-index"
1909-
checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305"
1937+
checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934"
19101938
dependencies = [
19111939
"displaydoc",
19121940
"icu_locid",
19131941
"icu_provider_macros",
19141942
"stable_deref_trait",
1943+
"tinystr",
19151944
"writeable",
19161945
"yoke",
19171946
"zerofrom",
@@ -1920,26 +1949,26 @@ dependencies = [
19201949

19211950
[[package]]
19221951
name = "icu_provider_adapters"
1923-
version = "1.2.0"
1952+
version = "1.3.2"
19241953
source = "registry+https://github.com/rust-lang/crates.io-index"
1925-
checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3"
1954+
checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d"
19261955
dependencies = [
19271956
"icu_locid",
1957+
"icu_locid_transform",
19281958
"icu_provider",
19291959
"tinystr",
1930-
"yoke",
19311960
"zerovec",
19321961
]
19331962

19341963
[[package]]
19351964
name = "icu_provider_macros"
1936-
version = "1.2.0"
1965+
version = "1.3.2"
19371966
source = "registry+https://github.com/rust-lang/crates.io-index"
1938-
checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"
1967+
checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99"
19391968
dependencies = [
19401969
"proc-macro2",
19411970
"quote",
1942-
"syn 1.0.109",
1971+
"syn 2.0.29",
19431972
]
19441973

19451974
[[package]]
@@ -2298,9 +2327,9 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
22982327

22992328
[[package]]
23002329
name = "litemap"
2301-
version = "0.7.0"
2330+
version = "0.7.1"
23022331
source = "registry+https://github.com/rust-lang/crates.io-index"
2303-
checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94"
2332+
checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1"
23042333

23052334
[[package]]
23062335
name = "lld-wrapper"
@@ -3544,6 +3573,7 @@ version = "0.0.0"
35443573
dependencies = [
35453574
"icu_list",
35463575
"icu_locid",
3576+
"icu_locid_transform",
35473577
"icu_provider",
35483578
"icu_provider_adapters",
35493579
"zerovec",
@@ -5484,9 +5514,9 @@ dependencies = [
54845514

54855515
[[package]]
54865516
name = "tinystr"
5487-
version = "0.7.1"
5517+
version = "0.7.4"
54885518
source = "registry+https://github.com/rust-lang/crates.io-index"
5489-
checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"
5519+
checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219"
54905520
dependencies = [
54915521
"displaydoc",
54925522
"zerovec",
@@ -6282,9 +6312,9 @@ dependencies = [
62826312

62836313
[[package]]
62846314
name = "writeable"
6285-
version = "0.5.2"
6315+
version = "0.5.3"
62866316
source = "registry+https://github.com/rust-lang/crates.io-index"
6287-
checksum = "60e49e42bdb1d5dc76f4cd78102f8f0714d32edfa3efb82286eb0f0b1fc0da0f"
6317+
checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2"
62886318

62896319
[[package]]
62906320
name = "xattr"
@@ -6344,9 +6374,9 @@ dependencies = [
63446374

63456375
[[package]]
63466376
name = "yoke"
6347-
version = "0.7.1"
6377+
version = "0.7.2"
63486378
source = "registry+https://github.com/rust-lang/crates.io-index"
6349-
checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de"
6379+
checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4"
63506380
dependencies = [
63516381
"serde",
63526382
"stable_deref_trait",
@@ -6389,9 +6419,9 @@ dependencies = [
63896419

63906420
[[package]]
63916421
name = "zerovec"
6392-
version = "0.9.4"
6422+
version = "0.10.0"
63936423
source = "registry+https://github.com/rust-lang/crates.io-index"
6394-
checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea"
6424+
checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e"
63956425
dependencies = [
63966426
"yoke",
63976427
"zerofrom",

‎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]

‎compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1/mod.rs

-6
This file was deleted.

‎compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1/und.rs.data

-66
This file was deleted.

‎compiler/rustc_baked_icu_data/src/data/fallback/mod.rs

-4
This file was deleted.

‎compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/mod.rs

-6
This file was deleted.

‎compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/und.rs.data

-13
This file was deleted.

‎compiler/rustc_baked_icu_data/src/data/fallback/supplement/co_v1/mod.rs

-6
This file was deleted.

‎compiler/rustc_baked_icu_data/src/data/fallback/supplement/co_v1/und.rs.data

-22
This file was deleted.

‎compiler/rustc_baked_icu_data/src/data/fallback/supplement/mod.rs

-2
This file was deleted.

‎compiler/rustc_baked_icu_data/src/data/list/and_v1/en.rs.data

-50
This file was deleted.

0 commit comments

Comments
 (0)