-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #111169 - Manishearth:rollup-55sfaad, r=Manishearth
Rollup of 10 pull requests Successful merges: - #97594 (Implement tuple<->array convertions via `From`) - #105452 (Add cross-language LLVM CFI support to the Rust compiler) - #105695 (Replace generic thread parker with explicit no-op parker) - #110371 (rustdoc: restructure type search engine to pick-and-use IDs) - #110928 (tests: Add tests for LoongArch64) - #110970 (tidy: remove ENTRY_LIMIT maximum checking and set it to 900) - #111104 (Update ICU4X to 1.2) - #111127 (Constify slice flatten method) - #111146 (rustc_middle: Fix `opt_item_ident` for non-local def ids) - #111154 (Use builtin FFX isolation for Fuchsia test runner) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
151 changed files
with
2,678 additions
and
2,948 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
702 changes: 20 additions & 682 deletions
702
compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1/und.rs.data
Large diffs are not rendered by default.
Oops, something went wrong.
207 changes: 2 additions & 205 deletions
207
compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/und.rs.data
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 12 additions & 36 deletions
48
compiler/rustc_baked_icu_data/src/data/list/and_v1/en.rs.data
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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, | ||
}, | ||
]) |
Oops, something went wrong.