Skip to content

Commit 9ce8348

Browse files
ManishearthManishearth
authored
Rollup merge of rust-lang#111104 - Manishearth:icuup, r=compiler-errors
Update ICU4X to 1.2 Was released a couple weeks ago. Also needed to make progress on rust-lang#109302 (though this PR does not achieve that part just yet)
2 parents 85c4991 + 6382876 commit 9ce8348

File tree

18 files changed

+212
-2042
lines changed

18 files changed

+212
-2042
lines changed

‎Cargo.lock

+16-16
Original file line numberDiff line numberDiff line change
@@ -1654,9 +1654,9 @@ dependencies = [
16541654

16551655
[[package]]
16561656
name = "icu_list"
1657-
version = "1.1.0"
1657+
version = "1.2.0"
16581658
source = "registry+https://github.com/rust-lang/crates.io-index"
1659-
checksum = "01a65ff0cab77c33c7e165c858eaa6e84a09f1e485dd495d9d0ae61083c6f786"
1659+
checksum = "fd7ba7442d9235b689d4fdce17c452ea229934980fd81ba50cc28275752c9f90"
16601660
dependencies = [
16611661
"displaydoc",
16621662
"icu_provider",
@@ -1666,9 +1666,9 @@ dependencies = [
16661666

16671667
[[package]]
16681668
name = "icu_locid"
1669-
version = "1.1.0"
1669+
version = "1.2.0"
16701670
source = "registry+https://github.com/rust-lang/crates.io-index"
1671-
checksum = "71d7a98ecb812760b5f077e55a4763edeefa7ccc30d6eb5680a70841ede81928"
1671+
checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335"
16721672
dependencies = [
16731673
"displaydoc",
16741674
"litemap",
@@ -1679,9 +1679,9 @@ dependencies = [
16791679

16801680
[[package]]
16811681
name = "icu_provider"
1682-
version = "1.1.0"
1682+
version = "1.2.0"
16831683
source = "registry+https://github.com/rust-lang/crates.io-index"
1684-
checksum = "a86816c97bc4e613086497f9479f63e120315e056763e8c4435604f98d21d82d"
1684+
checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305"
16851685
dependencies = [
16861686
"displaydoc",
16871687
"icu_locid",
@@ -1695,9 +1695,9 @@ dependencies = [
16951695

16961696
[[package]]
16971697
name = "icu_provider_adapters"
1698-
version = "1.1.0"
1698+
version = "1.2.0"
16991699
source = "registry+https://github.com/rust-lang/crates.io-index"
1700-
checksum = "8e89bf33962b24bb48a4a21330c20c9ff17949338ea376360dd9eda2c209dca1"
1700+
checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3"
17011701
dependencies = [
17021702
"icu_locid",
17031703
"icu_provider",
@@ -1708,9 +1708,9 @@ dependencies = [
17081708

17091709
[[package]]
17101710
name = "icu_provider_macros"
1711-
version = "1.1.0"
1711+
version = "1.2.0"
17121712
source = "registry+https://github.com/rust-lang/crates.io-index"
1713-
checksum = "9ddb07844c2ffc4c28840e799e9e54ff054393cf090740decf25624e9d94b93a"
1713+
checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"
17141714
dependencies = [
17151715
"proc-macro2",
17161716
"quote",
@@ -2031,9 +2031,9 @@ checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
20312031

20322032
[[package]]
20332033
name = "litemap"
2034-
version = "0.6.1"
2034+
version = "0.7.0"
20352035
source = "registry+https://github.com/rust-lang/crates.io-index"
2036-
checksum = "575d8a551c59104b4df91269921e5eab561aa1b77c618dac0414b5d44a4617de"
2036+
checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94"
20372037

20382038
[[package]]
20392039
name = "lld-wrapper"
@@ -5696,9 +5696,9 @@ dependencies = [
56965696

56975697
[[package]]
56985698
name = "yoke"
5699-
version = "0.7.0"
5699+
version = "0.7.1"
57005700
source = "registry+https://github.com/rust-lang/crates.io-index"
5701-
checksum = "222180af14a6b54ef2c33493c1eff77ae95a3687a21b243e752624006fb8f26e"
5701+
checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de"
57025702
dependencies = [
57035703
"serde",
57045704
"stable_deref_trait",
@@ -5741,9 +5741,9 @@ dependencies = [
57415741

57425742
[[package]]
57435743
name = "zerovec"
5744-
version = "0.9.2"
5744+
version = "0.9.4"
57455745
source = "registry+https://github.com/rust-lang/crates.io-index"
5746-
checksum = "154df60c74c4a844bc04a53cef4fc18a909d3ea07e19f5225eaba86209da3aa6"
5746+
checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea"
57475747
dependencies = [
57485748
"yoke",
57495749
"zerofrom",

‎compiler/rustc_baked_icu_data/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
icu_list = "1.1.0"
8-
icu_locid = "1.1.0"
9-
icu_provider = "1.1.0"
10-
icu_provider_adapters = "1.1.0"
11-
zerovec = "0.9.2"
7+
icu_list = "1.2"
8+
icu_locid = "1.2"
9+
icu_provider = "1.2"
10+
icu_provider_adapters = "1.2"
11+
zerovec = "0.9.4"
1212

1313
[features]
1414
rustc_use_parallel_compiler = ['icu_provider/sync']

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

+20-682
Large diffs are not rendered by default.

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

+2-205
Large diffs are not rendered by default.

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

+6-20
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,20 @@
22
parents: unsafe {
33
#[allow(unused_unsafe)]
44
::zerovec::ZeroMap::from_parts_unchecked(
5-
unsafe {
6-
::zerovec::VarZeroVec::from_bytes_unchecked(&[
7-
1u8, 0u8, 0u8, 0u8, 0u8, 0u8, 121u8, 117u8, 101u8,
8-
])
9-
},
10-
unsafe {
11-
::zerovec::ZeroVec::from_bytes_unchecked(&[
12-
122u8, 104u8, 0u8, 1u8, 72u8, 97u8, 110u8, 116u8, 0u8, 0u8, 0u8, 0u8,
13-
])
14-
},
5+
unsafe { ::zerovec::VarZeroVec::from_bytes_unchecked(b"\x01\0\0\0\0\0yue") },
6+
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(b"zh\0\x01Hant\0\0\0\0") },
157
)
168
},
179
unicode_extension_defaults: unsafe {
1810
#[allow(unused_unsafe)]
1911
::zerovec::ZeroMap2d::from_parts_unchecked(
20-
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[99u8, 111u8]) },
21-
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[2u8, 0u8, 0u8, 0u8]) },
12+
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(b"co") },
13+
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(b"\x02\0\0\0") },
2214
unsafe {
23-
::zerovec::VarZeroVec::from_bytes_unchecked(&[
24-
2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 2u8, 0u8, 122u8, 104u8, 122u8, 104u8, 45u8,
25-
72u8, 97u8, 110u8, 116u8,
26-
])
15+
::zerovec::VarZeroVec::from_bytes_unchecked(b"\x02\0\0\0\0\0\x02\0zhzh-Hant")
2716
},
2817
unsafe {
29-
::zerovec::VarZeroVec::from_bytes_unchecked(&[
30-
2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 6u8, 0u8, 112u8, 105u8, 110u8, 121u8, 105u8,
31-
110u8, 115u8, 116u8, 114u8, 111u8, 107u8, 101u8,
32-
])
18+
::zerovec::VarZeroVec::from_bytes_unchecked(b"\x02\0\0\0\0\0\x06\0pinyinstroke")
3319
},
3420
)
3521
},

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

+12-36
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,50 @@
11
::icu_list::provider::ListFormatterPatternsV1([
22
::icu_list::provider::ConditionalListJoinerPattern {
3-
default: unsafe {
4-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
5-
},
3+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
64
special_case: None,
75
},
86
::icu_list::provider::ConditionalListJoinerPattern {
9-
default: unsafe {
10-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
11-
},
7+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
128
special_case: None,
139
},
1410
::icu_list::provider::ConditionalListJoinerPattern {
15-
default: unsafe {
16-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", and ", 6u8)
17-
},
11+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", and ", 6u8),
1812
special_case: None,
1913
},
2014
::icu_list::provider::ConditionalListJoinerPattern {
21-
default: unsafe {
22-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(" and ", 5u8)
23-
},
15+
default: ::icu_list::provider::ListJoinerPattern::from_parts(" and ", 5u8),
2416
special_case: None,
2517
},
2618
::icu_list::provider::ConditionalListJoinerPattern {
27-
default: unsafe {
28-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
29-
},
19+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
3020
special_case: None,
3121
},
3222
::icu_list::provider::ConditionalListJoinerPattern {
33-
default: unsafe {
34-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
35-
},
23+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
3624
special_case: None,
3725
},
3826
::icu_list::provider::ConditionalListJoinerPattern {
39-
default: unsafe {
40-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", & ", 4u8)
41-
},
27+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", & ", 4u8),
4228
special_case: None,
4329
},
4430
::icu_list::provider::ConditionalListJoinerPattern {
45-
default: unsafe {
46-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(" & ", 3u8)
47-
},
31+
default: ::icu_list::provider::ListJoinerPattern::from_parts(" & ", 3u8),
4832
special_case: None,
4933
},
5034
::icu_list::provider::ConditionalListJoinerPattern {
51-
default: unsafe {
52-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
53-
},
35+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
5436
special_case: None,
5537
},
5638
::icu_list::provider::ConditionalListJoinerPattern {
57-
default: unsafe {
58-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
59-
},
39+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
6040
special_case: None,
6141
},
6242
::icu_list::provider::ConditionalListJoinerPattern {
63-
default: unsafe {
64-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
65-
},
43+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
6644
special_case: None,
6745
},
6846
::icu_list::provider::ConditionalListJoinerPattern {
69-
default: unsafe {
70-
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
71-
},
47+
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
7248
special_case: None,
7349
},
7450
])

0 commit comments

Comments
 (0)