Add StrListSepByOr

Author: Xiretza

compiler/rustc_baked_icu_data/src/data/macros.rs

@@ -45,3 +45,8 @@ pub use __impl_fallback_supplement_co_v1 as impl_fallback_supplement_co_v1;
 mod list_and_v1;
 #[doc(inline)]
 pub use __impl_list_and_v1 as impl_list_and_v1;
+#[macro_use]
+#[path = "macros/list_or_v1.rs.data"]
+mod list_or_v1;
+#[doc(inline)]
+pub use __impl_list_or_v1 as impl_list_or_v1;

compiler/rustc_baked_icu_data/src/data/macros/list_or_v1.rs.data

@@ -7,6 +7,7 @@ macro_rules! impl_data_provider {
         impl_fallback_parents_v1!($provider);
         impl_fallback_supplement_co_v1!($provider);
         impl_list_and_v1!($provider);
+        impl_list_or_v1!($provider);
     };
 }
 #[allow(unused_macros)]
@@ -20,6 +21,7 @@ macro_rules! impl_any_provider {
                     h if h == <icu_locid_transform::provider::LocaleFallbackParentsV1Marker as icu_provider::KeyedDataMarker>::KEY.hashed() => icu_provider::DataProvider::<icu_locid_transform::provider::LocaleFallbackParentsV1Marker>::load(self, req).map(icu_provider::DataResponse::wrap_into_any_response),
                     h if h == <icu_locid_transform::provider::CollationFallbackSupplementV1Marker as icu_provider::KeyedDataMarker>::KEY.hashed() => icu_provider::DataProvider::<icu_locid_transform::provider::CollationFallbackSupplementV1Marker>::load(self, req).map(icu_provider::DataResponse::wrap_into_any_response),
                     h if h == <icu_list::provider::AndListV1Marker as icu_provider::KeyedDataMarker>::KEY.hashed() => icu_provider::DataProvider::<icu_list::provider::AndListV1Marker>::load(self, req).map(icu_provider::DataResponse::wrap_into_any_response),
+                    h if h == <icu_list::provider::OrListV1Marker as icu_provider::KeyedDataMarker>::KEY.hashed() => icu_provider::DataProvider::<icu_list::provider::OrListV1Marker>::load(self, req).map(icu_provider::DataResponse::wrap_into_any_response),
                     _ => Err(icu_provider::DataErrorKind::MissingDataKey.with_req(key, req)),
                 }
             }

compiler/rustc_baked_icu_data/src/data/mod.rs

@@ -16,7 +16,7 @@
 //! ```text
 //! icu4x-datagen -W --pretty --fingerprint --use-separate-crates --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 \
+//!     -k list/and@1 list/or@1 fallback/likelysubtags@1 fallback/parents@1 fallback/supplement/co@1 \
 //!     --cldr-tag latest --icuexport-tag latest \
 //!     -o src/data
 //! ```

compiler/rustc_baked_icu_data/src/lib.rs

@@ -532,6 +532,7 @@ fn icu_locale_from_unic_langid(lang: LanguageIdentifier) -> Option<icu_locid::Lo
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 enum Separator {
     And,
+    Or,
 }
 
 impl Separator {
@@ -546,6 +547,11 @@ impl Separator {
                 &locale.into(),
                 icu_list::ListLength::Wide,
             ),
+            Separator::Or => icu_list::ListFormatter::try_new_or_with_length_with_any_provider(
+                &data_provider,
+                &locale.into(),
+                icu_list::ListLength::Wide,
+            ),
         }
         .expect("Failed to create list formatter")
     }
@@ -630,3 +636,10 @@ pub fn fluent_value_from_str_list_sep_by_and(l: Vec<Cow<'_, str>>) -> FluentValu
 
     FluentValue::Custom(Box::new(FluentStrListSepBy { sep: Separator::And, items }))
 }
+
+pub fn fluent_value_from_str_list_sep_by_or(l: Vec<Cow<'_, str>>) -> FluentValue<'_> {
+    // Fluent requires 'static value here for its AnyEq usages.
+    let items = l.into_iter().map(|x| x.into_owned()).collect();
+
+    FluentValue::Custom(Box::new(FluentStrListSepBy { sep: Separator::Or, items }))
+}

compiler/rustc_error_messages/src/lib.rs

@@ -7,7 +7,9 @@ use std::panic;
 use std::thread::panicking;
 
 use rustc_data_structures::fx::FxIndexMap;
-use rustc_error_messages::{fluent_value_from_str_list_sep_by_and, FluentValue};
+use rustc_error_messages::{
+    fluent_value_from_str_list_sep_by_and, fluent_value_from_str_list_sep_by_or, FluentValue,
+};
 use rustc_lint_defs::{Applicability, LintExpectationId};
 use rustc_macros::{Decodable, Encodable};
 use rustc_span::source_map::Spanned;
@@ -44,6 +46,7 @@ pub enum DiagArgValue {
     // to strings in `into_diag_arg` and stored using the `Str` variant.
     Number(i32),
     StrListSepByAnd(Vec<Cow<'static, str>>),
+    StrListSepByOr(Vec<Cow<'static, str>>),
 }
 
 pub type DiagArgMap = FxIndexMap<DiagArgName, DiagArgValue>;
@@ -167,6 +170,7 @@ impl Into<FluentValue<'static>> for DiagArgValue {
             DiagArgValue::Str(s) => From::from(s),
             DiagArgValue::Number(n) => From::from(n),
             DiagArgValue::StrListSepByAnd(l) => fluent_value_from_str_list_sep_by_and(l),
+            DiagArgValue::StrListSepByOr(l) => fluent_value_from_str_list_sep_by_or(l),
         }
     }
 }