forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
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 rust-lang#108056 - matthiaskrgr:rollup-oa6bxvh, r=matth…
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#107573 (Update the minimum external LLVM to 14) - rust-lang#107626 (Fix `x fix` on the standard library itself) - rust-lang#107673 (update ICU4X to 1.1.0) - rust-lang#107733 (Store metrics from `metrics.json` to CI PGO timer) - rust-lang#108007 (Use `is_str` instead of string kind comparison) - rust-lang#108033 (add an unstable `#[rustc_coinductive]` attribute) - rust-lang#108039 (Refactor refcounted structural_impls via functors) - rust-lang#108040 (Use derive attributes for uninteresting traversals) - rust-lang#108044 (interpret: rename Pointer::from_addr → from_addr_invalid) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
106 changed files
with
3,190 additions
and
2,703 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,2 @@ | ||
| // @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() }) | ||
| } | ||
| } | ||
| impl_any_provider!(BakedDataProvider); |
Oops, something went wrong.