Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename parts of neo to "Names" #4434

Merged
merged 3 commits into from
Dec 9, 2023
Merged

Rename parts of neo to "Names" #4434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2498325
Renaming datetime things to "Names"
sffc Dec 8, 2023
eca82db
More renames
sffc Dec 8, 2023
ffe3bf0
fmt
sffc Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions components/datetime/src/calendar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ pub trait CldrCalendar: InternalCldrCalendar {

#[cfg(feature = "experimental")]
/// The data marker for loading year symbols for this calendar.
type YearSymbolsV1Marker: KeyedDataMarker<Yokeable = YearSymbolsV1<'static>>;
type YearNamesV1Marker: KeyedDataMarker<Yokeable = YearNamesV1<'static>>;

#[cfg(feature = "experimental")]
/// The data marker for loading month symbols for this calendar.
type MonthSymbolsV1Marker: KeyedDataMarker<Yokeable = MonthSymbolsV1<'static>>;
type MonthNamesV1Marker: KeyedDataMarker<Yokeable = MonthNamesV1<'static>>;

/// Checks if a given BCP 47 identifier is allowed to be used with this calendar
///
Expand Down Expand Up @@ -88,49 +88,49 @@ impl CldrCalendar for Buddhist {
type DateSymbolsV1Marker = BuddhistDateSymbolsV1Marker;
type DateLengthsV1Marker = BuddhistDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = BuddhistYearSymbolsV1Marker;
type YearNamesV1Marker = BuddhistYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = BuddhistMonthSymbolsV1Marker;
type MonthNamesV1Marker = BuddhistMonthNamesV1Marker;
}

impl CldrCalendar for Chinese {
const DEFAULT_BCP_47_IDENTIFIER: Value = value!("chinese");
type DateSymbolsV1Marker = ChineseDateSymbolsV1Marker;
type DateLengthsV1Marker = ChineseDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = ChineseYearSymbolsV1Marker;
type YearNamesV1Marker = ChineseYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = ChineseMonthSymbolsV1Marker;
type MonthNamesV1Marker = ChineseMonthNamesV1Marker;
}

impl CldrCalendar for Coptic {
const DEFAULT_BCP_47_IDENTIFIER: Value = value!("coptic");
type DateSymbolsV1Marker = CopticDateSymbolsV1Marker;
type DateLengthsV1Marker = CopticDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = CopticYearSymbolsV1Marker;
type YearNamesV1Marker = CopticYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = CopticMonthSymbolsV1Marker;
type MonthNamesV1Marker = CopticMonthNamesV1Marker;
}

impl CldrCalendar for Dangi {
const DEFAULT_BCP_47_IDENTIFIER: Value = value!("dangi");
type DateSymbolsV1Marker = DangiDateSymbolsV1Marker;
type DateLengthsV1Marker = DangiDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = DangiYearSymbolsV1Marker;
type YearNamesV1Marker = DangiYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = DangiMonthSymbolsV1Marker;
type MonthNamesV1Marker = DangiMonthNamesV1Marker;
}

impl CldrCalendar for Ethiopian {
const DEFAULT_BCP_47_IDENTIFIER: Value = value!("ethiopic");
type DateSymbolsV1Marker = EthiopianDateSymbolsV1Marker;
type DateLengthsV1Marker = EthiopianDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = EthiopianYearSymbolsV1Marker;
type YearNamesV1Marker = EthiopianYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = EthiopianMonthSymbolsV1Marker;
type MonthNamesV1Marker = EthiopianMonthNamesV1Marker;
fn is_identifier_allowed_for_calendar(value: &Value) -> bool {
*value == value!("ethiopic") || *value == value!("ethioaa")
}
Expand All @@ -141,29 +141,29 @@ impl CldrCalendar for Gregorian {
type DateSymbolsV1Marker = GregorianDateSymbolsV1Marker;
type DateLengthsV1Marker = GregorianDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = GregorianYearSymbolsV1Marker;
type YearNamesV1Marker = GregorianYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = GregorianMonthSymbolsV1Marker;
type MonthNamesV1Marker = GregorianMonthNamesV1Marker;
}

impl CldrCalendar for Hebrew {
const DEFAULT_BCP_47_IDENTIFIER: Value = value!("hebrew");
type DateSymbolsV1Marker = HebrewDateSymbolsV1Marker;
type DateLengthsV1Marker = HebrewDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = HebrewYearSymbolsV1Marker;
type YearNamesV1Marker = HebrewYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = HebrewMonthSymbolsV1Marker;
type MonthNamesV1Marker = HebrewMonthNamesV1Marker;
}

impl CldrCalendar for Indian {
const DEFAULT_BCP_47_IDENTIFIER: Value = value!("indian");
type DateSymbolsV1Marker = IndianDateSymbolsV1Marker;
type DateLengthsV1Marker = IndianDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = IndianYearSymbolsV1Marker;
type YearNamesV1Marker = IndianYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = IndianMonthSymbolsV1Marker;
type MonthNamesV1Marker = IndianMonthNamesV1Marker;
}

impl CldrCalendar for IslamicCivil {
Expand All @@ -174,9 +174,9 @@ impl CldrCalendar for IslamicCivil {
type DateSymbolsV1Marker = IslamicDateSymbolsV1Marker;
type DateLengthsV1Marker = IslamicDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = IslamicYearSymbolsV1Marker;
type YearNamesV1Marker = IslamicYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = IslamicMonthSymbolsV1Marker;
type MonthNamesV1Marker = IslamicMonthNamesV1Marker;
fn is_identifier_allowed_for_calendar(value: &Value) -> bool {
*value == value!("islamicc") || is_islamic_subcal(value, tinystr!(8, "civil"))
}
Expand All @@ -187,9 +187,9 @@ impl CldrCalendar for IslamicObservational {
type DateSymbolsV1Marker = IslamicDateSymbolsV1Marker;
type DateLengthsV1Marker = IslamicDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = IslamicYearSymbolsV1Marker;
type YearNamesV1Marker = IslamicYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = IslamicMonthSymbolsV1Marker;
type MonthNamesV1Marker = IslamicMonthNamesV1Marker;
}

impl CldrCalendar for IslamicTabular {
Expand All @@ -200,9 +200,9 @@ impl CldrCalendar for IslamicTabular {
type DateSymbolsV1Marker = IslamicDateSymbolsV1Marker;
type DateLengthsV1Marker = IslamicDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = IslamicYearSymbolsV1Marker;
type YearNamesV1Marker = IslamicYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = IslamicMonthSymbolsV1Marker;
type MonthNamesV1Marker = IslamicMonthNamesV1Marker;
fn is_identifier_allowed_for_calendar(value: &Value) -> bool {
is_islamic_subcal(value, tinystr!(8, "tbla"))
}
Expand All @@ -216,9 +216,9 @@ impl CldrCalendar for IslamicUmmAlQura {
type DateSymbolsV1Marker = IslamicDateSymbolsV1Marker;
type DateLengthsV1Marker = IslamicDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = IslamicYearSymbolsV1Marker;
type YearNamesV1Marker = IslamicYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = IslamicMonthSymbolsV1Marker;
type MonthNamesV1Marker = IslamicMonthNamesV1Marker;
fn is_identifier_allowed_for_calendar(value: &Value) -> bool {
is_islamic_subcal(value, tinystr!(8, "umalqura"))
}
Expand All @@ -229,39 +229,39 @@ impl CldrCalendar for Japanese {
type DateSymbolsV1Marker = JapaneseDateSymbolsV1Marker;
type DateLengthsV1Marker = JapaneseDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = JapaneseYearSymbolsV1Marker;
type YearNamesV1Marker = JapaneseYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = JapaneseMonthSymbolsV1Marker;
type MonthNamesV1Marker = JapaneseMonthNamesV1Marker;
}

impl CldrCalendar for JapaneseExtended {
const DEFAULT_BCP_47_IDENTIFIER: Value = value!("japanext");
type DateSymbolsV1Marker = JapaneseExtendedDateSymbolsV1Marker;
type DateLengthsV1Marker = JapaneseExtendedDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = JapaneseExtendedYearSymbolsV1Marker;
type YearNamesV1Marker = JapaneseExtendedYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = JapaneseExtendedMonthSymbolsV1Marker;
type MonthNamesV1Marker = JapaneseExtendedMonthNamesV1Marker;
}

impl CldrCalendar for Persian {
const DEFAULT_BCP_47_IDENTIFIER: Value = value!("persian");
type DateSymbolsV1Marker = PersianDateSymbolsV1Marker;
type DateLengthsV1Marker = PersianDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = PersianYearSymbolsV1Marker;
type YearNamesV1Marker = PersianYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = PersianMonthSymbolsV1Marker;
type MonthNamesV1Marker = PersianMonthNamesV1Marker;
}

impl CldrCalendar for Roc {
const DEFAULT_BCP_47_IDENTIFIER: Value = value!("roc");
type DateSymbolsV1Marker = RocDateSymbolsV1Marker;
type DateLengthsV1Marker = RocDateLengthsV1Marker;
#[cfg(feature = "experimental")]
type YearSymbolsV1Marker = RocYearSymbolsV1Marker;
type YearNamesV1Marker = RocYearNamesV1Marker;
#[cfg(feature = "experimental")]
type MonthSymbolsV1Marker = RocMonthSymbolsV1Marker;
type MonthNamesV1Marker = RocMonthNamesV1Marker;
}

impl InternalCldrCalendar for Buddhist {}
Expand Down
Loading