Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #111162

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9622cde
std: replace generic thread parker with explicit no-op parker
joboet Dec 11, 2022
1a7132d
rustdoc-search: fix incorrect doc comment
notriddle Apr 14, 2023
4c11822
rustdoc: restructure type search engine to pick-and-use IDs
notriddle Apr 15, 2023
b6f81e0
rustdoc-search: give longer notification for type corrections
notriddle Apr 19, 2023
e0a7462
rustdoc-search: clean up `checkIfInGenerics` call at end of `checkType`
notriddle Apr 20, 2023
7529d87
rustdoc-search: make type name correction choice deterministic
notriddle Apr 20, 2023
395840c
rustdoc-search: use more descriptive "x not found; y instead" message
notriddle Apr 20, 2023
759e4d3
Add cross-language LLVM CFI support to the Rust compiler
rcvalle Dec 13, 2022
77b4492
Update documentation for LLVM CFI support
rcvalle Dec 13, 2022
9fba262
implement tuple<->array convertions via `From`
WaffleLapkin May 31, 2022
4d04a06
Use metavar `${count(x)}` instead of reimplementing it
WaffleLapkin Jun 2, 2022
04305c0
Remove `[]` <-> `()` `From` convertions
WaffleLapkin Jun 2, 2022
36f8693
--bless tests
WaffleLapkin Jun 2, 2022
522eeba
Update ICU4X to 1.2
Manishearth May 2, 2023
6382876
Regen baked data
Manishearth May 2, 2023
4fec8a3
Constify slice flatten method
KamilaBorowska May 3, 2023
6f6c379
rustc_middle: Fix `opt_item_ident` for non-local def ids
petrochenkov May 3, 2023
e973836
Use builtin FFX isolation for Fuchsia test runner
May 3, 2023
de10516
Mention array<->tuple convs in docs
WaffleLapkin May 3, 2023
cefc4a2
Rollup merge of #97594 - WaffleLapkin:array_tuple_conv, r=ChrisDenton
Manishearth May 3, 2023
04e968a
Rollup merge of #105452 - rcvalle:rust-cfi-3, r=bjorn3
Manishearth May 3, 2023
84c5179
Rollup merge of #105695 - joboet:remove_generic_parker, r=m-ou-se
Manishearth May 3, 2023
3daf40e
Rollup merge of #110371 - notriddle:notriddle/search-corrections, r=G…
Manishearth May 3, 2023
93acb8b
Rollup merge of #111104 - Manishearth:icuup, r=compiler-errors
Manishearth May 3, 2023
1b255c8
Rollup merge of #111127 - xfix:const-slice-flatten, r=scottmcm
Manishearth May 3, 2023
b0198f2
Rollup merge of #111146 - petrochenkov:decident, r=compiler-errors
Manishearth May 3, 2023
2d4521f
Rollup merge of #111154 - djkoloski:use_builtin_ffx_isolation, r=tmandry
Manishearth May 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1654,9 +1654,9 @@ dependencies = [

[[package]]
name = "icu_list"
version = "1.1.0"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01a65ff0cab77c33c7e165c858eaa6e84a09f1e485dd495d9d0ae61083c6f786"
checksum = "fd7ba7442d9235b689d4fdce17c452ea229934980fd81ba50cc28275752c9f90"
dependencies = [
"displaydoc",
"icu_provider",
Expand All @@ -1666,9 +1666,9 @@ dependencies = [

[[package]]
name = "icu_locid"
version = "1.1.0"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d7a98ecb812760b5f077e55a4763edeefa7ccc30d6eb5680a70841ede81928"
checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335"
dependencies = [
"displaydoc",
"litemap",
Expand All @@ -1679,9 +1679,9 @@ dependencies = [

[[package]]
name = "icu_provider"
version = "1.1.0"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a86816c97bc4e613086497f9479f63e120315e056763e8c4435604f98d21d82d"
checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305"
dependencies = [
"displaydoc",
"icu_locid",
Expand All @@ -1695,9 +1695,9 @@ dependencies = [

[[package]]
name = "icu_provider_adapters"
version = "1.1.0"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e89bf33962b24bb48a4a21330c20c9ff17949338ea376360dd9eda2c209dca1"
checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3"
dependencies = [
"icu_locid",
"icu_provider",
Expand All @@ -1708,9 +1708,9 @@ dependencies = [

[[package]]
name = "icu_provider_macros"
version = "1.1.0"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ddb07844c2ffc4c28840e799e9e54ff054393cf090740decf25624e9d94b93a"
checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"
dependencies = [
"proc-macro2",
"quote",
Expand Down Expand Up @@ -2031,9 +2031,9 @@ checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"

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

[[package]]
name = "lld-wrapper"
Expand Down Expand Up @@ -5696,9 +5696,9 @@ dependencies = [

[[package]]
name = "yoke"
version = "0.7.0"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "222180af14a6b54ef2c33493c1eff77ae95a3687a21b243e752624006fb8f26e"
checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de"
dependencies = [
"serde",
"stable_deref_trait",
Expand Down Expand Up @@ -5741,9 +5741,9 @@ dependencies = [

[[package]]
name = "zerovec"
version = "0.9.2"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "154df60c74c4a844bc04a53cef4fc18a909d3ea07e19f5225eaba86209da3aa6"
checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea"
dependencies = [
"yoke",
"zerofrom",
Expand Down
10 changes: 5 additions & 5 deletions compiler/rustc_baked_icu_data/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ version = "0.0.0"
edition = "2021"

[dependencies]
icu_list = "1.1.0"
icu_locid = "1.1.0"
icu_provider = "1.1.0"
icu_provider_adapters = "1.1.0"
zerovec = "0.9.2"
icu_list = "1.2"
icu_locid = "1.2"
icu_provider = "1.2"
icu_provider_adapters = "1.2"
zerovec = "0.9.4"

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

Large diffs are not rendered by default.

207 changes: 2 additions & 205 deletions compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/und.rs.data

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,20 @@
parents: unsafe {
#[allow(unused_unsafe)]
::zerovec::ZeroMap::from_parts_unchecked(
unsafe {
::zerovec::VarZeroVec::from_bytes_unchecked(&[
1u8, 0u8, 0u8, 0u8, 0u8, 0u8, 121u8, 117u8, 101u8,
])
},
unsafe {
::zerovec::ZeroVec::from_bytes_unchecked(&[
122u8, 104u8, 0u8, 1u8, 72u8, 97u8, 110u8, 116u8, 0u8, 0u8, 0u8, 0u8,
])
},
unsafe { ::zerovec::VarZeroVec::from_bytes_unchecked(b"\x01\0\0\0\0\0yue") },
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(b"zh\0\x01Hant\0\0\0\0") },
)
},
unicode_extension_defaults: unsafe {
#[allow(unused_unsafe)]
::zerovec::ZeroMap2d::from_parts_unchecked(
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[99u8, 111u8]) },
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[2u8, 0u8, 0u8, 0u8]) },
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(b"co") },
unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(b"\x02\0\0\0") },
unsafe {
::zerovec::VarZeroVec::from_bytes_unchecked(&[
2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 2u8, 0u8, 122u8, 104u8, 122u8, 104u8, 45u8,
72u8, 97u8, 110u8, 116u8,
])
::zerovec::VarZeroVec::from_bytes_unchecked(b"\x02\0\0\0\0\0\x02\0zhzh-Hant")
},
unsafe {
::zerovec::VarZeroVec::from_bytes_unchecked(&[
2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 6u8, 0u8, 112u8, 105u8, 110u8, 121u8, 105u8,
110u8, 115u8, 116u8, 114u8, 111u8, 107u8, 101u8,
])
::zerovec::VarZeroVec::from_bytes_unchecked(b"\x02\0\0\0\0\0\x06\0pinyinstroke")
},
)
},
Expand Down
48 changes: 12 additions & 36 deletions compiler/rustc_baked_icu_data/src/data/list/and_v1/en.rs.data
Original file line number Diff line number Diff line change
@@ -1,74 +1,50 @@
::icu_list::provider::ListFormatterPatternsV1([
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", and ", 6u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", and ", 6u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(" and ", 5u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(" and ", 5u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", & ", 4u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", & ", 4u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(" & ", 3u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(" & ", 3u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
special_case: None,
},
::icu_list::provider::ConditionalListJoinerPattern {
default: unsafe {
::icu_list::provider::ListJoinerPattern::from_parts_unchecked(", ", 2u8)
},
default: ::icu_list::provider::ListJoinerPattern::from_parts(", ", 2u8),
special_case: None,
},
])
Loading