Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit ff0ffda

Browse filesBrowse files
borsbors
committed
Auto merge of rust-lang#104591 - Manishearth:rollup-b3ser4e, r=Manishearth
Rollup of 8 pull requests Successful merges: - rust-lang#102977 (remove HRTB from `[T]::is_sorted_by{,_key}`) - rust-lang#103378 (Fix mod_inv termination for the last iteration) - rust-lang#103456 (`unchecked_{shl|shr}` should use `u32` as the RHS) - rust-lang#103701 (Simplify some pointer method implementations) - rust-lang#104047 (Diagnostics `icu4x` based list formatting.) - rust-lang#104338 (Enforce that `dyn*` coercions are actually pointer-sized) - rust-lang#104498 (Edit docs for `rustc_errors::Handler::stash_diagnostic`) - rust-lang#104556 (rustdoc: use `code-header` class to format enum variants) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents b833ad5 + 9db23f8 commit ff0ffda
Copy full SHA for ff0ffda

File tree

Expand file treeCollapse file tree

48 files changed

+3030
-150
lines changed
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

48 files changed

+3030
-150
lines changed
Open diff view settings
Collapse file

‎Cargo.lock‎

Copy file name to clipboardExpand all lines: Cargo.lock
+177-3Lines changed: 177 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
211211
dependencies = [
212212
"lazy_static",
213213
"memchr",
214-
"regex-automata",
214+
"regex-automata 0.1.10",
215215
]
216216

217217
[[package]]
@@ -222,7 +222,7 @@ checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd"
222222
dependencies = [
223223
"memchr",
224224
"once_cell",
225-
"regex-automata",
225+
"regex-automata 0.1.10",
226226
"serde",
227227
]
228228

@@ -1707,6 +1707,73 @@ version = "2.0.1"
17071707
source = "registry+https://github.com/rust-lang/crates.io-index"
17081708
checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
17091709

1710+
[[package]]
1711+
name = "icu_list"
1712+
version = "1.0.0"
1713+
source = "registry+https://github.com/rust-lang/crates.io-index"
1714+
checksum = "c40218275f081c4493f190357c5395647b06734c2dc3dcb41cc099a0f60168b1"
1715+
dependencies = [
1716+
"displaydoc",
1717+
"icu_locid",
1718+
"icu_provider",
1719+
"regex-automata 0.2.0",
1720+
"writeable",
1721+
"zerovec",
1722+
]
1723+
1724+
[[package]]
1725+
name = "icu_locid"
1726+
version = "1.0.0"
1727+
source = "registry+https://github.com/rust-lang/crates.io-index"
1728+
checksum = "34b3de5d99a0e275fe6193b9586dbf37364daebc0d39c89b5cf8376a53b789e8"
1729+
dependencies = [
1730+
"displaydoc",
1731+
"litemap",
1732+
"tinystr",
1733+
"writeable",
1734+
"zerovec",
1735+
]
1736+
1737+
[[package]]
1738+
name = "icu_provider"
1739+
version = "1.0.1"
1740+
source = "registry+https://github.com/rust-lang/crates.io-index"
1741+
checksum = "2f911086e3c521a8a824d4f8bfd87769645ced2f07ff913b521c0d793be07100"
1742+
dependencies = [
1743+
"displaydoc",
1744+
"icu_locid",
1745+
"icu_provider_macros",
1746+
"stable_deref_trait",
1747+
"writeable",
1748+
"yoke",
1749+
"zerofrom",
1750+
"zerovec",
1751+
]
1752+
1753+
[[package]]
1754+
name = "icu_provider_adapters"
1755+
version = "1.0.0"
1756+
source = "registry+https://github.com/rust-lang/crates.io-index"
1757+
checksum = "980c71d8a91b246ebbb97847178a4b816eea39d1d550c70ee566384555bb6545"
1758+
dependencies = [
1759+
"icu_locid",
1760+
"icu_provider",
1761+
"tinystr",
1762+
"yoke",
1763+
"zerovec",
1764+
]
1765+
1766+
[[package]]
1767+
name = "icu_provider_macros"
1768+
version = "1.0.0"
1769+
source = "registry+https://github.com/rust-lang/crates.io-index"
1770+
checksum = "38cf6f5b65cf81f0b4298da647101acbfe6ae0e25263f92bd7a22597e9d6d606"
1771+
dependencies = [
1772+
"proc-macro2",
1773+
"quote",
1774+
"syn",
1775+
]
1776+
17101777
[[package]]
17111778
name = "idna"
17121779
version = "0.2.0"
@@ -2034,6 +2101,12 @@ dependencies = [
20342101
"walkdir",
20352102
]
20362103

2104+
[[package]]
2105+
name = "litemap"
2106+
version = "0.6.0"
2107+
source = "registry+https://github.com/rust-lang/crates.io-index"
2108+
checksum = "f34a3f4798fac63fb48cf277eefa38f94d3443baff555bb98e4f56bc9092368e"
2109+
20372110
[[package]]
20382111
name = "lld-wrapper"
20392112
version = "0.1.0"
@@ -2100,7 +2173,7 @@ version = "0.1.0"
21002173
source = "registry+https://github.com/rust-lang/crates.io-index"
21012174
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
21022175
dependencies = [
2103-
"regex-automata",
2176+
"regex-automata 0.1.10",
21042177
]
21052178

21062179
[[package]]
@@ -2927,6 +3000,15 @@ dependencies = [
29273000
"regex-syntax",
29283001
]
29293002

3003+
[[package]]
3004+
name = "regex-automata"
3005+
version = "0.2.0"
3006+
source = "registry+https://github.com/rust-lang/crates.io-index"
3007+
checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782"
3008+
dependencies = [
3009+
"memchr",
3010+
]
3011+
29303012
[[package]]
29313013
name = "regex-syntax"
29323014
version = "0.6.26"
@@ -3202,6 +3284,18 @@ dependencies = [
32023284
"rustc_span",
32033285
]
32043286

3287+
[[package]]
3288+
name = "rustc_baked_icu_data"
3289+
version = "0.0.0"
3290+
dependencies = [
3291+
"icu_list",
3292+
"icu_locid",
3293+
"icu_provider",
3294+
"icu_provider_adapters",
3295+
"litemap",
3296+
"zerovec",
3297+
]
3298+
32053299
[[package]]
32063300
name = "rustc_borrowck"
32073301
version = "0.0.0"
@@ -3422,13 +3516,18 @@ version = "0.0.0"
34223516
dependencies = [
34233517
"fluent-bundle",
34243518
"fluent-syntax",
3519+
"icu_list",
3520+
"icu_locid",
3521+
"icu_provider_adapters",
34253522
"intl-memoizer",
3523+
"rustc_baked_icu_data",
34263524
"rustc_data_structures",
34273525
"rustc_macros",
34283526
"rustc_serialize",
34293527
"rustc_span",
34303528
"tracing",
34313529
"unic-langid",
3530+
"writeable",
34323531
]
34333532

34343533
[[package]]
@@ -4935,6 +5034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
49355034
checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2"
49365035
dependencies = [
49375036
"displaydoc",
5037+
"zerovec",
49385038
]
49395039

49405040
[[package]]
@@ -5547,6 +5647,12 @@ version = "0.42.0"
55475647
source = "registry+https://github.com/rust-lang/crates.io-index"
55485648
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
55495649

5650+
[[package]]
5651+
name = "writeable"
5652+
version = "0.5.0"
5653+
source = "registry+https://github.com/rust-lang/crates.io-index"
5654+
checksum = "f8e6ab4f5da1b24daf2c590cfac801bacb27b15b4f050e84eb60149ea726f06b"
5655+
55505656
[[package]]
55515657
name = "xattr"
55525658
version = "0.2.2"
@@ -5599,3 +5705,71 @@ checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
55995705
dependencies = [
56005706
"winapi",
56015707
]
5708+
5709+
[[package]]
5710+
name = "yoke"
5711+
version = "0.6.2"
5712+
source = "registry+https://github.com/rust-lang/crates.io-index"
5713+
checksum = "1fe1d55ca72c32d573bfbd5cb2f0ca65a497854c44762957a6d3da96041a5184"
5714+
dependencies = [
5715+
"serde",
5716+
"stable_deref_trait",
5717+
"yoke-derive",
5718+
"zerofrom",
5719+
]
5720+
5721+
[[package]]
5722+
name = "yoke-derive"
5723+
version = "0.6.1"
5724+
source = "registry+https://github.com/rust-lang/crates.io-index"
5725+
checksum = "1346e4cd025ae818b88566eac7eb65ab33a994ea55f355c86889af2e7e56b14e"
5726+
dependencies = [
5727+
"proc-macro2",
5728+
"quote",
5729+
"syn",
5730+
"synstructure",
5731+
]
5732+
5733+
[[package]]
5734+
name = "zerofrom"
5735+
version = "0.1.1"
5736+
source = "registry+https://github.com/rust-lang/crates.io-index"
5737+
checksum = "79e9355fccf72b04b7deaa99ce7a0f6630530acf34045391b74460fcd714de54"
5738+
dependencies = [
5739+
"zerofrom-derive",
5740+
]
5741+
5742+
[[package]]
5743+
name = "zerofrom-derive"
5744+
version = "0.1.1"
5745+
source = "registry+https://github.com/rust-lang/crates.io-index"
5746+
checksum = "2e8aa86add9ddbd2409c1ed01e033cd457d79b1b1229b64922c25095c595e829"
5747+
dependencies = [
5748+
"proc-macro2",
5749+
"quote",
5750+
"syn",
5751+
"synstructure",
5752+
]
5753+
5754+
[[package]]
5755+
name = "zerovec"
5756+
version = "0.9.0"
5757+
source = "registry+https://github.com/rust-lang/crates.io-index"
5758+
checksum = "b9d919a74c17749ccb17beaf6405562e413cd94e98ba52ca1e64bbe7eefbd8b8"
5759+
dependencies = [
5760+
"yoke",
5761+
"zerofrom",
5762+
"zerovec-derive",
5763+
]
5764+
5765+
[[package]]
5766+
name = "zerovec-derive"
5767+
version = "0.9.0"
5768+
source = "registry+https://github.com/rust-lang/crates.io-index"
5769+
checksum = "490e5f878c2856225e884c35927e7ea6db3c24cdb7229b72542c7526ad7ed49e"
5770+
dependencies = [
5771+
"proc-macro2",
5772+
"quote",
5773+
"syn",
5774+
"synstructure",
5775+
]
Collapse file

‎compiler/rustc_baked_icu_data/Cargo.toml‎

Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[package]
2+
name = "rustc_baked_icu_data"
3+
version = "0.0.0"
4+
edition = "2021"
5+
6+
[dependencies]
7+
icu_list = "1.0.0"
8+
icu_locid = "1.0.0"
9+
icu_provider = "1.0.1"
10+
icu_provider_adapters = "1.0.0"
11+
litemap = "0.6.0"
12+
zerovec = "0.9.0"
13+
14+
[features]
15+
rustc_use_parallel_compiler = ['icu_provider/sync']
Collapse file

‎compiler/rustc_baked_icu_data/src/data/any.rs‎

Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// @generated
2+
impl AnyProvider for BakedDataProvider {
3+
fn load_any(&self, key: DataKey, req: DataRequest) -> Result<AnyResponse, DataError> {
4+
const ANDLISTV1MARKER: ::icu_provider::DataKeyHash =
5+
::icu_list::provider::AndListV1Marker::KEY.hashed();
6+
const COLLATIONFALLBACKSUPPLEMENTV1MARKER: ::icu_provider::DataKeyHash =
7+
::icu_provider_adapters::fallback::provider::CollationFallbackSupplementV1Marker::KEY
8+
.hashed();
9+
const LOCALEFALLBACKLIKELYSUBTAGSV1MARKER: ::icu_provider::DataKeyHash =
10+
::icu_provider_adapters::fallback::provider::LocaleFallbackLikelySubtagsV1Marker::KEY
11+
.hashed();
12+
const LOCALEFALLBACKPARENTSV1MARKER: ::icu_provider::DataKeyHash =
13+
::icu_provider_adapters::fallback::provider::LocaleFallbackParentsV1Marker::KEY
14+
.hashed();
15+
#[allow(clippy::match_single_binding)]
16+
match key.hashed() {
17+
ANDLISTV1MARKER => list::and_v1::DATA
18+
.get_by(|k| req.locale.strict_cmp(k.as_bytes()).reverse())
19+
.copied()
20+
.map(AnyPayload::from_static_ref)
21+
.ok_or(DataErrorKind::MissingLocale),
22+
COLLATIONFALLBACKSUPPLEMENTV1MARKER => fallback::supplement::co_v1::DATA
23+
.get_by(|k| req.locale.strict_cmp(k.as_bytes()).reverse())
24+
.copied()
25+
.map(AnyPayload::from_static_ref)
26+
.ok_or(DataErrorKind::MissingLocale),
27+
LOCALEFALLBACKLIKELYSUBTAGSV1MARKER => fallback::likelysubtags_v1::DATA
28+
.get_by(|k| req.locale.strict_cmp(k.as_bytes()).reverse())
29+
.copied()
30+
.map(AnyPayload::from_static_ref)
31+
.ok_or(DataErrorKind::MissingLocale),
32+
LOCALEFALLBACKPARENTSV1MARKER => fallback::parents_v1::DATA
33+
.get_by(|k| req.locale.strict_cmp(k.as_bytes()).reverse())
34+
.copied()
35+
.map(AnyPayload::from_static_ref)
36+
.ok_or(DataErrorKind::MissingLocale),
37+
_ => Err(DataErrorKind::MissingDataKey),
38+
}
39+
.map_err(|e| e.with_req(key, req))
40+
.map(|payload| AnyResponse { payload: Some(payload), metadata: Default::default() })
41+
}
42+
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.