diff --git a/compiler/rustc_baked_icu_data/src/data/list/and_v1.rs b/compiler/rustc_baked_icu_data/src/data/list/and_v1.rs index aefaa2cc9c939..9cae549e118d5 100644 --- a/compiler/rustc_baked_icu_data/src/data/list/and_v1.rs +++ b/compiler/rustc_baked_icu_data/src/data/list/and_v1.rs @@ -11,7 +11,8 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = ("ru", RU), ("tr", TR), ("und", UND), - ("zh-Hans", ZH_HANS), + ("zh", ZH_ZH_HANS), + ("zh-Hans", ZH_ZH_HANS), ("zh-Hant", ZH_HANT), ]); static EN: &DataStruct = &::icu_list::provider::ListFormatterPatternsV1([ @@ -1010,7 +1011,7 @@ static UND: &DataStruct = &::icu_list::provider::ListFormatterPatternsV1([ special_case: None, }, ]); -static ZH_HANS: &DataStruct = &::icu_list::provider::ListFormatterPatternsV1([ +static ZH_HANT: &DataStruct = &::icu_list::provider::ListFormatterPatternsV1([ ::icu_list::provider::ConditionalListJoinerPattern { default: unsafe { ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("、", 3u8) @@ -1073,18 +1074,18 @@ static ZH_HANS: &DataStruct = &::icu_list::provider::ListFormatterPatternsV1([ }, ::icu_list::provider::ConditionalListJoinerPattern { default: unsafe { - ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("、", 3u8) + ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("和", 3u8) }, special_case: None, }, ::icu_list::provider::ConditionalListJoinerPattern { default: unsafe { - ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("、", 3u8) + ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("和", 3u8) }, special_case: None, }, ]); -static ZH_HANT: &DataStruct = &::icu_list::provider::ListFormatterPatternsV1([ +static ZH_ZH_HANS: &DataStruct = &::icu_list::provider::ListFormatterPatternsV1([ ::icu_list::provider::ConditionalListJoinerPattern { default: unsafe { ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("、", 3u8) @@ -1147,13 +1148,13 @@ static ZH_HANT: &DataStruct = &::icu_list::provider::ListFormatterPatternsV1([ }, ::icu_list::provider::ConditionalListJoinerPattern { default: unsafe { - ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("和", 3u8) + ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("、", 3u8) }, special_case: None, }, ::icu_list::provider::ConditionalListJoinerPattern { default: unsafe { - ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("和", 3u8) + ::icu_list::provider::ListJoinerPattern::from_parts_unchecked("、", 3u8) }, special_case: None, }, diff --git a/compiler/rustc_baked_icu_data/src/lib.rs b/compiler/rustc_baked_icu_data/src/lib.rs index b76ee6cae06ec..2109a7a780b11 100644 --- a/compiler/rustc_baked_icu_data/src/lib.rs +++ b/compiler/rustc_baked_icu_data/src/lib.rs @@ -5,7 +5,7 @@ /* generated with: ```text icu4x-datagen -W --pretty --fingerprint --use-separate-crates --cldr-tag latest --icuexport-tag latest \ ---format mod -l en es fr it ja pt ru tr zh-Hans zh-Hant -k list/and@1 fallback/likelysubtags@1 fallback/parents@1 fallback/supplement/co@1 \ +--format mod -l en es fr it ja pt ru tr zh zh-Hans zh-Hant -k list/and@1 fallback/likelysubtags@1 fallback/parents@1 fallback/supplement/co@1 \ -o src/data ``` */