Skip to content

Rollup of 6 pull requests #104495

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

Closed
wants to merge 49 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
a02ec4c
remove HRTB from `[T]::is_sorted_by{,_key}`
Oct 12, 2022
f3d7b39
add regression test
Oct 12, 2022
aaa2392
Merge from rustc
RalfJung Nov 5, 2022
42e450d
Auto merge of #2650 - RalfJung:rustup, r=RalfJung
bors Nov 5, 2022
4828edf
Auto merge of #2638 - DrMeepster:windows-condvars, r=RalfJung
bors Nov 6, 2022
46d0df4
remove a stray stderr file
RalfJung Nov 6, 2022
724c1a0
Auto merge of #2653 - RalfJung:stderr, r=RalfJung
bors Nov 6, 2022
943f88b
README: Add macos cache deletion command
mkroening Nov 6, 2022
57d06f7
Auto merge of #2654 - mkroening:macos-cache, r=RalfJung
bors Nov 6, 2022
1f0a672
bump rustc-build-sysroot
RalfJung Nov 6, 2022
9c574d8
Auto merge of #2655 - RalfJung:rustc-build-sysroot, r=RalfJung
bors Nov 6, 2022
2b39687
Add miri_alloc, miri_dealloc
mkroening Nov 7, 2022
de562ec
Bump ui test
oli-obk Nov 8, 2022
71c3ecf
Auto merge of #2659 - oli-obk:ui_test_bump, r=RalfJung
bors Nov 8, 2022
c02fa89
Merge from rustc
RalfJung Nov 10, 2022
9356627
Auto merge of #2662 - RalfJung:rustup, r=RalfJung
bors Nov 10, 2022
b9ccc46
Minimal implementation of implicit deref patterns
fee1-dead Jul 5, 2022
f6123c5
Add feature gate
fee1-dead Jul 5, 2022
f06efcd
Move a ui test to make space for new folder
fee1-dead Jul 5, 2022
1a75a9b
Adding more tests
fee1-dead Jul 13, 2022
422b935
Add `rustc_baked_icu_data` crate.
crlf0710 Nov 5, 2022
18a1de2
Migrate diagnostics list output to use icu list formatter.
crlf0710 Nov 6, 2022
1ebe279
Import icu locale fallback data
crlf0710 Nov 6, 2022
9f6c6bd
Enable icu sync feature for parallel compiler
crlf0710 Nov 6, 2022
4c24176
Include `zh` locale in icu data
crlf0710 Nov 6, 2022
332f79e
Rm diagnostic item, use lang item
fee1-dead Jul 5, 2022
26be4ab
rename to `string_deref_patterns`
fee1-dead Nov 11, 2022
ecaf5f7
Fix compilation issue after rebase
crlf0710 Nov 12, 2022
6adb2df
pthread: slight refactoring of how we access the sync object fields
RalfJung Nov 13, 2022
2e6676d
Auto merge of #2663 - RalfJung:sync, r=RalfJung
bors Nov 13, 2022
096c33f
final tweaks
RalfJung Nov 13, 2022
9ef0de9
Auto merge of #2657 - mkroening:miri-alloc, r=RalfJung
bors Nov 13, 2022
269ce36
migrating rustc_resolve to SessionDiagnostic. work in progress. start
rajputrajat Sep 5, 2022
8d7f257
Merge from rustc
RalfJung Nov 15, 2022
c6649aa
Auto merge of #2665 - RalfJung:rustup, r=RalfJung
bors Nov 15, 2022
3c72492
update josh instructions
RalfJung Nov 15, 2022
a046f62
Auto merge of #2666 - RalfJung:josh, r=RalfJung
bors Nov 15, 2022
a47e431
adjust josh pushing and remove ./miri toolchain updating the toolchai…
RalfJung Nov 15, 2022
209bcbb
Auto merge of #2667 - RalfJung:josh, r=RalfJung
bors Nov 15, 2022
5516273
update lockfile
RalfJung Nov 15, 2022
d75c76d
Update crate documentation of `rustc_baked_icu_data` crate
crlf0710 Nov 15, 2022
6906f08
allow fastrand dependency
RalfJung Nov 16, 2022
157b2d5
ensure rand has its default features enabled
RalfJung Nov 16, 2022
9539eef
Rollup merge of #98914 - fee1-dead-contrib:min-deref-patterns, r=comp…
Manishearth Nov 16, 2022
9cab6ca
Rollup merge of #101162 - rajputrajat:master, r=davidtwco
Manishearth Nov 16, 2022
a396240
Rollup merge of #102977 - lukas-code:is-sorted-hrtb, r=m-ou-se
Manishearth Nov 16, 2022
fbc93c5
Rollup merge of #104047 - crlf0710:icu_based_list_formatting, r=david…
Manishearth Nov 16, 2022
82f40e0
Rollup merge of #104456 - RalfJung:miri, r=RalfJung
Manishearth Nov 16, 2022
e31f007
coalesce lockfile changes
Manishearth Nov 16, 2022
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
257 changes: 216 additions & 41 deletions Cargo.lock

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions compiler/rustc_baked_icu_data/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[package]
name = "rustc_baked_icu_data"
version = "0.0.0"
edition = "2021"

[dependencies]
icu_list = "1.0.0"
icu_locid = "1.0.0"
icu_provider = "1.0.1"
icu_provider_adapters = "1.0.0"
litemap = "0.6.0"
zerovec = "0.9.0"

[features]
rustc_use_parallel_compiler = ['icu_provider/sync']
42 changes: 42 additions & 0 deletions compiler/rustc_baked_icu_data/src/data/any.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// @generated
impl AnyProvider for BakedDataProvider {
fn load_any(&self, key: DataKey, req: DataRequest) -> Result<AnyResponse, DataError> {
const ANDLISTV1MARKER: ::icu_provider::DataKeyHash =
::icu_list::provider::AndListV1Marker::KEY.hashed();
const COLLATIONFALLBACKSUPPLEMENTV1MARKER: ::icu_provider::DataKeyHash =
::icu_provider_adapters::fallback::provider::CollationFallbackSupplementV1Marker::KEY
.hashed();
const LOCALEFALLBACKLIKELYSUBTAGSV1MARKER: ::icu_provider::DataKeyHash =
::icu_provider_adapters::fallback::provider::LocaleFallbackLikelySubtagsV1Marker::KEY
.hashed();
const LOCALEFALLBACKPARENTSV1MARKER: ::icu_provider::DataKeyHash =
::icu_provider_adapters::fallback::provider::LocaleFallbackParentsV1Marker::KEY
.hashed();
#[allow(clippy::match_single_binding)]
match key.hashed() {
ANDLISTV1MARKER => list::and_v1::DATA
.get_by(|k| req.locale.strict_cmp(k.as_bytes()).reverse())
.copied()
.map(AnyPayload::from_static_ref)
.ok_or(DataErrorKind::MissingLocale),
COLLATIONFALLBACKSUPPLEMENTV1MARKER => fallback::supplement::co_v1::DATA
.get_by(|k| req.locale.strict_cmp(k.as_bytes()).reverse())
.copied()
.map(AnyPayload::from_static_ref)
.ok_or(DataErrorKind::MissingLocale),
LOCALEFALLBACKLIKELYSUBTAGSV1MARKER => fallback::likelysubtags_v1::DATA
.get_by(|k| req.locale.strict_cmp(k.as_bytes()).reverse())
.copied()
.map(AnyPayload::from_static_ref)
.ok_or(DataErrorKind::MissingLocale),
LOCALEFALLBACKPARENTSV1MARKER => fallback::parents_v1::DATA
.get_by(|k| req.locale.strict_cmp(k.as_bytes()).reverse())
.copied()
.map(AnyPayload::from_static_ref)
.ok_or(DataErrorKind::MissingLocale),
_ => Err(DataErrorKind::MissingDataKey),
}
.map_err(|e| e.with_req(key, req))
.map(|payload| AnyResponse { payload: Some(payload), metadata: Default::default() })
}
}
733 changes: 733 additions & 0 deletions compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1.rs

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions compiler/rustc_baked_icu_data/src/data/fallback/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// @generated
pub mod likelysubtags_v1;
pub mod parents_v1;
pub mod supplement;
207 changes: 207 additions & 0 deletions compiler/rustc_baked_icu_data/src/data/fallback/parents_v1.rs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// @generated
type DataStruct = < :: icu_provider_adapters :: fallback :: provider :: CollationFallbackSupplementV1Marker as :: icu_provider :: DataMarker > :: Yokeable ;
pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> =
litemap::LiteMap::from_sorted_store_unchecked(&[("und", UND)]);
static UND: &DataStruct =
&::icu_provider_adapters::fallback::provider::LocaleFallbackSupplementV1 {
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,
])
},
)
},
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::VarZeroVec::from_bytes_unchecked(&[
2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 2u8, 0u8, 122u8, 104u8, 122u8, 104u8, 45u8,
72u8, 97u8, 110u8, 116u8,
])
},
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,
])
},
)
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// @generated
pub mod co_v1;
Loading