Skip to content

Commit 129195f

Browse files
borsbors
committed
Auto merge of rust-lang#111169 - Manishearth:rollup-55sfaad, r=Manishearth
Rollup of 10 pull requests Successful merges: - rust-lang#97594 (Implement tuple<->array convertions via `From`) - rust-lang#105452 (Add cross-language LLVM CFI support to the Rust compiler) - rust-lang#105695 (Replace generic thread parker with explicit no-op parker) - rust-lang#110371 (rustdoc: restructure type search engine to pick-and-use IDs) - rust-lang#110928 (tests: Add tests for LoongArch64) - rust-lang#110970 (tidy: remove ENTRY_LIMIT maximum checking and set it to 900) - rust-lang#111104 (Update ICU4X to 1.2) - rust-lang#111127 (Constify slice flatten method) - rust-lang#111146 (rustc_middle: Fix `opt_item_ident` for non-local def ids) - rust-lang#111154 (Use builtin FFX isolation for Fuchsia test runner) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents f557a4f + 31aeef2 commit 129195f

File tree

151 files changed

+2678
-2948
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+2678
-2948
lines changed

Diff for: ‎Cargo.lock

+16-16
Original file line numberDiff line numberDiff line change
@@ -1655,9 +1655,9 @@ dependencies = [
16551655

16561656
[[package]]
16571657
name = "icu_list"
1658-
version = "1.1.0"
1658+
version = "1.2.0"
16591659
source = "registry+https://github.com/rust-lang/crates.io-index"
1660-
checksum = "01a65ff0cab77c33c7e165c858eaa6e84a09f1e485dd495d9d0ae61083c6f786"
1660+
checksum = "fd7ba7442d9235b689d4fdce17c452ea229934980fd81ba50cc28275752c9f90"
16611661
dependencies = [
16621662
"displaydoc",
16631663
"icu_provider",
@@ -1667,9 +1667,9 @@ dependencies = [
16671667

16681668
[[package]]
16691669
name = "icu_locid"
1670-
version = "1.1.0"
1670+
version = "1.2.0"
16711671
source = "registry+https://github.com/rust-lang/crates.io-index"
1672-
checksum = "71d7a98ecb812760b5f077e55a4763edeefa7ccc30d6eb5680a70841ede81928"
1672+
checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335"
16731673
dependencies = [
16741674
"displaydoc",
16751675
"litemap",
@@ -1680,9 +1680,9 @@ dependencies = [
16801680

16811681
[[package]]
16821682
name = "icu_provider"
1683-
version = "1.1.0"
1683+
version = "1.2.0"
16841684
source = "registry+https://github.com/rust-lang/crates.io-index"
1685-
checksum = "a86816c97bc4e613086497f9479f63e120315e056763e8c4435604f98d21d82d"
1685+
checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305"
16861686
dependencies = [
16871687
"displaydoc",
16881688
"icu_locid",
@@ -1696,9 +1696,9 @@ dependencies = [
16961696

16971697
[[package]]
16981698
name = "icu_provider_adapters"
1699-
version = "1.1.0"
1699+
version = "1.2.0"
17001700
source = "registry+https://github.com/rust-lang/crates.io-index"
1701-
checksum = "8e89bf33962b24bb48a4a21330c20c9ff17949338ea376360dd9eda2c209dca1"
1701+
checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3"
17021702
dependencies = [
17031703
"icu_locid",
17041704
"icu_provider",
@@ -1709,9 +1709,9 @@ dependencies = [
17091709

17101710
[[package]]
17111711
name = "icu_provider_macros"
1712-
version = "1.1.0"
1712+
version = "1.2.0"
17131713
source = "registry+https://github.com/rust-lang/crates.io-index"
1714-
checksum = "9ddb07844c2ffc4c28840e799e9e54ff054393cf090740decf25624e9d94b93a"
1714+
checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"
17151715
dependencies = [
17161716
"proc-macro2",
17171717
"quote",
@@ -2032,9 +2032,9 @@ checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
20322032

20332033
[[package]]
20342034
name = "litemap"
2035-
version = "0.6.1"
2035+
version = "0.7.0"
20362036
source = "registry+https://github.com/rust-lang/crates.io-index"
2037-
checksum = "575d8a551c59104b4df91269921e5eab561aa1b77c618dac0414b5d44a4617de"
2037+
checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94"
20382038

20392039
[[package]]
20402040
name = "lld-wrapper"
@@ -5698,9 +5698,9 @@ dependencies = [
56985698

56995699
[[package]]
57005700
name = "yoke"
5701-
version = "0.7.0"
5701+
version = "0.7.1"
57025702
source = "registry+https://github.com/rust-lang/crates.io-index"
5703-
checksum = "222180af14a6b54ef2c33493c1eff77ae95a3687a21b243e752624006fb8f26e"
5703+
checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de"
57045704
dependencies = [
57055705
"serde",
57065706
"stable_deref_trait",
@@ -5743,9 +5743,9 @@ dependencies = [
57435743

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

Diff for: ‎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']

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

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

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

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

Diff for: ‎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
},

Diff for: ‎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)