Remove Auto and YearWeek variants from enums and data (#5810)

#1317

Author: sffc

components/datetime/src/neo_skeleton.rs

@@ -339,26 +339,6 @@ pub enum NeoDateComponents {
     /// The day of the week alone, as in
     /// “Saturday”.
     Weekday,
-    /// Fields to represent the day chosen by locale.
-    ///
-    /// These are the _standard date patterns_ for types "long", "medium", and
-    /// "short" as defined in [UTS 35]. For "full", use
-    /// [`AutoWeekday`](NeoDateComponents::AutoWeekday).
-    ///
-    /// This is often, but not always, the same as
-    /// [`YearMonthDay`](NeoDateComponents::YearMonthDay).
-    ///
-    /// [UTS 35]: <https://www.unicode.org/reports/tr35/tr35-dates.html#dateFormats>
-    Auto,
-    /// Fields to represent the day chosen by locale, hinting to also include
-    /// a weekday field.
-    ///
-    /// This is the _standard date pattern_ for type "full", extended with
-    /// skeleton data in the short and medium forms.
-    ///
-    /// This is often, but not always, the same as
-    /// [`YearMonthDayWeekday`](NeoDateComponents::YearMonthDayWeekday).
-    AutoWeekday,
 }
 
 impl NeoDateComponents {
@@ -371,8 +351,6 @@ impl NeoDateComponents {
         Self::MonthDayWeekday,
         Self::YearMonthDayWeekday,
         Self::Weekday,
-        Self::Auto,
-        Self::AutoWeekday,
     ];
 
     const DAY: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("d");
@@ -386,9 +364,6 @@ impl NeoDateComponents {
     const YEAR_MONTH_DAY_WEEKDAY: &'static DataMarkerAttributes =
         DataMarkerAttributes::from_str_or_panic("ym0de");
     const WEEKDAY: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("e");
-    const AUTO: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("a1");
-    const AUTO_WEEKDAY: &'static DataMarkerAttributes =
-        DataMarkerAttributes::from_str_or_panic("a1e");
 
     // For matching
     const DAY_STR: &'static str = Self::DAY.as_str();
@@ -398,8 +373,6 @@ impl NeoDateComponents {
     const MONTH_DAY_WEEKDAY_STR: &'static str = Self::MONTH_DAY_WEEKDAY.as_str();
     const YEAR_MONTH_DAY_WEEKDAY_STR: &'static str = Self::YEAR_MONTH_DAY_WEEKDAY.as_str();
     const WEEKDAY_STR: &'static str = Self::WEEKDAY.as_str();
-    const AUTO_STR: &'static str = Self::AUTO.as_str();
-    const AUTO_WEEKDAY_STR: &'static str = Self::AUTO_WEEKDAY.as_str();
 
     /// Returns a stable string identifying this set of components.
     ///
@@ -410,7 +383,6 @@ impl NeoDateComponents {
     /// 1. Lowercase letters are chosen where there is no ambiguity: `G` becomes `g`\*
     /// 2. Capitals are replaced with their lowercase and a number 0: `M` becomes `m0`
     /// 3. A single symbol is included for each component: length doesn't matter
-    /// 4. The "auto" style is represented as `a1`
     ///
     /// \* `g` represents a different field, but it is never used in skeleta.
     ///
@@ -433,8 +405,6 @@ impl NeoDateComponents {
             Self::MonthDayWeekday => Self::MONTH_DAY_WEEKDAY,
             Self::YearMonthDayWeekday => Self::YEAR_MONTH_DAY_WEEKDAY,
             Self::Weekday => Self::WEEKDAY,
-            Self::Auto => Self::AUTO,
-            Self::AutoWeekday => Self::AUTO_WEEKDAY,
         }
     }
 
@@ -462,8 +432,6 @@ impl NeoDateComponents {
             Self::MONTH_DAY_WEEKDAY_STR => Some(Self::MonthDayWeekday),
             Self::YEAR_MONTH_DAY_WEEKDAY_STR => Some(Self::YearMonthDayWeekday),
             Self::WEEKDAY_STR => Some(Self::Weekday),
-            Self::AUTO_STR => Some(Self::Auto),
-            Self::AUTO_WEEKDAY_STR => Some(Self::AutoWeekday),
             _ => None,
         }
     }
@@ -478,8 +446,6 @@ impl NeoDateComponents {
             Self::MonthDayWeekday => false,
             Self::YearMonthDayWeekday => true,
             Self::Weekday => false,
-            Self::Auto => true,
-            Self::AutoWeekday => true,
         }
     }
 
@@ -493,8 +459,6 @@ impl NeoDateComponents {
             Self::MonthDayWeekday => true,
             Self::YearMonthDayWeekday => true,
             Self::Weekday => false,
-            Self::Auto => true,
-            Self::AutoWeekday => true,
         }
     }
 
@@ -508,8 +472,6 @@ impl NeoDateComponents {
             Self::MonthDayWeekday => true,
             Self::YearMonthDayWeekday => true,
             Self::Weekday => false,
-            Self::Auto => true,
-            Self::AutoWeekday => true,
         }
     }
 
@@ -523,8 +485,6 @@ impl NeoDateComponents {
             Self::MonthDayWeekday => true,
             Self::YearMonthDayWeekday => true,
             Self::Weekday => true,
-            Self::Auto => false,
-            Self::AutoWeekday => true,
         }
     }
 
@@ -559,27 +519,22 @@ pub enum NeoCalendarPeriodComponents {
     /// A year, as in
     /// “2000”.
     Year,
-    /// The year and week of the year, as in
-    /// “52nd week of 1999”.
-    YearWeek,
     // TODO(#501): Consider adding support for Quarter and YearQuarter.
 }
 
 impl NeoCalendarPeriodComponents {
     /// All values of this enum.
-    pub const VALUES: &'static [Self] = &[Self::Month, Self::YearMonth, Self::Year, Self::YearWeek];
+    pub const VALUES: &'static [Self] = &[Self::Month, Self::YearMonth, Self::Year];
 
     const MONTH: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("m0");
     const YEAR_MONTH: &'static DataMarkerAttributes =
         DataMarkerAttributes::from_str_or_panic("ym0");
     const YEAR: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("y");
-    const YEAR_WEEK: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("y0w");
 
     // For matching
     const MONTH_STR: &'static str = Self::MONTH.as_str();
     const YEAR_MONTH_STR: &'static str = Self::YEAR_MONTH.as_str();
     const YEAR_STR: &'static str = Self::YEAR.as_str();
-    const YEAR_WEEK_STR: &'static str = Self::YEAR_WEEK.as_str();
 
     /// Returns a stable string identifying this set of components.
     ///
@@ -589,7 +544,6 @@ impl NeoCalendarPeriodComponents {
             Self::Month => Self::MONTH,
             Self::YearMonth => Self::YEAR_MONTH,
             Self::Year => Self::YEAR,
-            Self::YearWeek => Self::YEAR_WEEK,
         }
     }
 
@@ -601,7 +555,6 @@ impl NeoCalendarPeriodComponents {
             Self::MONTH_STR => Some(Self::Month),
             Self::YEAR_MONTH_STR => Some(Self::YearMonth),
             Self::YEAR_STR => Some(Self::Year),
-            Self::YEAR_WEEK_STR => Some(Self::YearWeek),
             _ => None,
         }
     }
@@ -612,7 +565,6 @@ impl NeoCalendarPeriodComponents {
             Self::Month => false,
             Self::YearMonth => true,
             Self::Year => true,
-            Self::YearWeek => true,
         }
     }
 
@@ -622,7 +574,6 @@ impl NeoCalendarPeriodComponents {
             Self::Month => true,
             Self::YearMonth => true,
             Self::Year => false,
-            Self::YearWeek => false,
         }
     }
 
@@ -658,30 +609,20 @@ pub enum NeoTimeComponents {
     /// A time of day with a 24-hour clock,
     /// with the precision chosen by [`TimePrecision`]
     Time24,
-    /// Fields to represent the time chosen by the locale.
-    ///
-    /// These are the _standard time patterns_ for types "medium" and
-    /// "short" as defined in [UTS 35]. For "full" and "long", use a
-    /// formatter that includes a time zone.
-    ///
-    /// [UTS 35]: <https://www.unicode.org/reports/tr35/tr35-dates.html#dateFormats>
-    Auto,
 }
 
 impl NeoTimeComponents {
     /// All values of this enum.
-    pub const VALUES: &'static [Self] = &[Self::Time, Self::Time12, Self::Time24, Self::Auto];
+    pub const VALUES: &'static [Self] = &[Self::Time, Self::Time12, Self::Time24];
 
     const HOUR: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("j");
     const HOUR12: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("h");
     const HOUR24: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("h0");
-    const AUTO: &'static DataMarkerAttributes = DataMarkerAttributes::from_str_or_panic("a1");
 
     // For matching
     const HOUR_STR: &'static str = Self::HOUR.as_str();
     const HOUR12_STR: &'static str = Self::HOUR12.as_str();
     const HOUR24_STR: &'static str = Self::HOUR24.as_str();
-    const AUTO_STR: &'static str = Self::AUTO.as_str();
 
     /// Returns a stable string identifying this set of components.
     ///
@@ -691,7 +632,6 @@ impl NeoTimeComponents {
             Self::Time => Self::HOUR,
             Self::Time12 => Self::HOUR12,
             Self::Time24 => Self::HOUR24,
-            Self::Auto => Self::AUTO,
         }
     }
 
@@ -703,7 +643,6 @@ impl NeoTimeComponents {
             Self::HOUR_STR => Some(Self::Time),
             Self::HOUR12_STR => Some(Self::Time12),
             Self::HOUR24_STR => Some(Self::Time24),
-            Self::AUTO_STR => Some(Self::Auto),
             _ => None,
         }
     }
@@ -1081,19 +1020,6 @@ impl NeoDateSkeleton {
             year_style: None,
         }
     }
-
-    /// Converts a [`length::Date`] to a [`NeoDateComponents`] and [`NeoSkeletonLength`].
-    #[doc(hidden)] // the types involved in this mapping may change
-    #[cfg(feature = "datagen")]
-    pub fn from_date_length(date_length: length::Date) -> NeoDateSkeleton {
-        let (components, length) = match date_length {
-            length::Date::Full => (NeoDateComponents::AutoWeekday, NeoSkeletonLength::Long),
-            length::Date::Long => (NeoDateComponents::Auto, NeoSkeletonLength::Long),
-            length::Date::Medium => (NeoDateComponents::Auto, NeoSkeletonLength::Medium),
-            length::Date::Short => (NeoDateComponents::Auto, NeoSkeletonLength::Short),
-        };
-        NeoDateSkeleton::for_length_and_components(length, components)
-    }
 }
 
 /// A skeleton for formatting a calendar period (i.e. month or year).
@@ -1274,25 +1200,3 @@ impl NeoSkeleton {
         }
     }
 }
-
-impl NeoDateTimeSkeleton {
-    #[doc(hidden)] // mostly internal; maps from old API to new API
-    #[cfg(feature = "datagen")]
-    pub fn from_date_time_length(
-        date_length: crate::options::length::Date,
-        time_length: crate::options::length::Time,
-    ) -> Self {
-        let date_skeleton = NeoDateSkeleton::from_date_length(date_length);
-        let time_precision = TimePrecision::from_time_length(time_length);
-        NeoDateTimeSkeleton {
-            length: date_skeleton.length,
-            components: NeoDateTimeComponents::DateTime(
-                date_skeleton.components,
-                NeoTimeComponents::Time,
-            ),
-            alignment: None,
-            year_style: None,
-            time_precision: Some(time_precision),
-        }
-    }
-}