Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/rust
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Manishearth/rust
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: listup
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 26 files changed
  • 1 contributor

Commits on Feb 14, 2023

  1. Update icu_list to 1.1

    @Manishearth
    Manishearth committed Feb 14, 2023
    Copy the full SHA
    458e09c View commit details

  2. Update baked data

    @Manishearth
    Manishearth committed Feb 14, 2023
    Copy the full SHA
    84314af View commit details
Showing with 2,731 additions and 2,294 deletions.
  1. +24 −26 Cargo.lock
  2. +1 −41 compiler/rustc_baked_icu_data/src/data/any.rs
  3. +0 −733 compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1.rs
  4. +6 −0 compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1/mod.rs
  5. +728 −0 compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1/und.rs.data
  6. +0 −207 compiler/rustc_baked_icu_data/src/data/fallback/parents_v1.rs
  7. +6 −0 compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/mod.rs
  8. +216 −0 compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/und.rs.data
  9. +0 −41 compiler/rustc_baked_icu_data/src/data/fallback/supplement/co_v1.rs
  10. +6 −0 compiler/rustc_baked_icu_data/src/data/fallback/supplement/co_v1/mod.rs
  11. +36 −0 compiler/rustc_baked_icu_data/src/data/fallback/supplement/co_v1/und.rs.data
  12. +0 −1,161 compiler/rustc_baked_icu_data/src/data/list/and_v1.rs
  13. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/en.rs.data
  14. +836 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/es.rs.data
  15. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/fr.rs.data
  16. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/it.rs.data
  17. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/ja.rs.data
  18. +22 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/mod.rs
  19. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/pt.rs.data
  20. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/ru.rs.data
  21. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/tr.rs.data
  22. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/und.rs.data
  23. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/zh-Hant.rs.data
  24. +74 −0 compiler/rustc_baked_icu_data/src/data/list/and_v1/zh.rs.data
  25. +105 −82 compiler/rustc_baked_icu_data/src/data/mod.rs
  26. +5 −3 compiler/rustc_baked_icu_data/src/lib.rs
50 changes: 24 additions & 26 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
@@ -2027,23 +2027,21 @@ checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"

[[package]]
name = "icu_list"
version = "1.0.0"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c40218275f081c4493f190357c5395647b06734c2dc3dcb41cc099a0f60168b1"
checksum = "01a65ff0cab77c33c7e165c858eaa6e84a09f1e485dd495d9d0ae61083c6f786"
dependencies = [
"displaydoc",
"icu_locid",
"icu_provider",
"regex-automata 0.2.0",
"writeable",
"zerovec",
]

[[package]]
name = "icu_locid"
version = "1.0.0"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34b3de5d99a0e275fe6193b9586dbf37364daebc0d39c89b5cf8376a53b789e8"
checksum = "71d7a98ecb812760b5f077e55a4763edeefa7ccc30d6eb5680a70841ede81928"
dependencies = [
"displaydoc",
"litemap",
@@ -2054,9 +2052,9 @@ dependencies = [

[[package]]
name = "icu_provider"
version = "1.0.1"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f911086e3c521a8a824d4f8bfd87769645ced2f07ff913b521c0d793be07100"
checksum = "a86816c97bc4e613086497f9479f63e120315e056763e8c4435604f98d21d82d"
dependencies = [
"displaydoc",
"icu_locid",
@@ -2070,9 +2068,9 @@ dependencies = [

[[package]]
name = "icu_provider_adapters"
version = "1.0.0"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "980c71d8a91b246ebbb97847178a4b816eea39d1d550c70ee566384555bb6545"
checksum = "8e89bf33962b24bb48a4a21330c20c9ff17949338ea376360dd9eda2c209dca1"
dependencies = [
"icu_locid",
"icu_provider",
@@ -2083,9 +2081,9 @@ dependencies = [

[[package]]
name = "icu_provider_macros"
version = "1.0.0"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38cf6f5b65cf81f0b4298da647101acbfe6ae0e25263f92bd7a22597e9d6d606"
checksum = "9ddb07844c2ffc4c28840e799e9e54ff054393cf090740decf25624e9d94b93a"
dependencies = [
"proc-macro2",
"quote",
@@ -2451,9 +2449,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"

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

[[package]]
name = "lld-wrapper"
@@ -5660,9 +5658,9 @@ dependencies = [

[[package]]
name = "tinystr"
version = "0.7.0"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2"
checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"
dependencies = [
"displaydoc",
"zerovec",
@@ -6352,9 +6350,9 @@ checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"

[[package]]
name = "writeable"
version = "0.5.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8e6ab4f5da1b24daf2c590cfac801bacb27b15b4f050e84eb60149ea726f06b"
checksum = "92d74a687e3b9a7a129db0a8c82b4d464eb9c36f5a66ca68572a7e5f1cfdb5bc"

[[package]]
name = "xattr"
@@ -6411,9 +6409,9 @@ dependencies = [

[[package]]
name = "yoke"
version = "0.6.2"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fe1d55ca72c32d573bfbd5cb2f0ca65a497854c44762957a6d3da96041a5184"
checksum = "222180af14a6b54ef2c33493c1eff77ae95a3687a21b243e752624006fb8f26e"
dependencies = [
"serde",
"stable_deref_trait",
@@ -6423,9 +6421,9 @@ dependencies = [

[[package]]
name = "yoke-derive"
version = "0.6.1"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1346e4cd025ae818b88566eac7eb65ab33a994ea55f355c86889af2e7e56b14e"
checksum = "ca800d73d6b7a7ee54f2608205c98b549fca71c9500c1abcb3abdc7708b4a8cb"
dependencies = [
"proc-macro2",
"quote",
@@ -6462,9 +6460,9 @@ checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"

[[package]]
name = "zerovec"
version = "0.9.0"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9d919a74c17749ccb17beaf6405562e413cd94e98ba52ca1e64bbe7eefbd8b8"
checksum = "61885f7a36e5dfe1f0709b919a2749cb1ed613d6b3ef65fa029787164594b9c8"
dependencies = [
"yoke",
"zerofrom",
@@ -6473,9 +6471,9 @@ dependencies = [

[[package]]
name = "zerovec-derive"
version = "0.9.0"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "490e5f878c2856225e884c35927e7ea6db3c24cdb7229b72542c7526ad7ed49e"
checksum = "2154cb6e2a748163354165e22c6a555effb09ca2d16334767bf66bb404f2206e"
dependencies = [
"proc-macro2",
"quote",
42 changes: 1 addition & 41 deletions compiler/rustc_baked_icu_data/src/data/any.rs
View file
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);
Loading