rm NeverField (#5693)

Fixes #5689

Author: sffc

components/datetime/src/format/neo.rs

@@ -14,7 +14,7 @@ use crate::input;
 use crate::input::ExtractedInput;
 use crate::neo_marker::{
     AllInputMarkers, DateInputMarkers, DateTimeMarkers, GetField, IsInCalendar, NeoNeverMarker,
-    NeverField, TimeMarkers, TypedDateDataMarkers, ZoneMarkers,
+    TimeMarkers, TypedDateDataMarkers, ZoneMarkers,
 };
 use crate::neo_pattern::{DateTimePattern, DateTimePatternBorrowed};
 use crate::neo_skeleton::NeoDateTimeSkeleton;
@@ -2306,7 +2306,7 @@ where
             + GetField<<R::D as DateInputMarkers>::DayOfMonthInput>
             + GetField<<R::D as DateInputMarkers>::DayOfWeekInput>
             + GetField<<R::D as DateInputMarkers>::AnyCalendarKindInput>
-            + GetField<NeverField>,
+            + GetField<()>,
     {
         FormattedDateTimePattern {
             pattern: self.inner.pattern,
@@ -2371,7 +2371,7 @@ where
             + GetField<<R::T as TimeMarkers>::MinuteInput>
             + GetField<<R::T as TimeMarkers>::SecondInput>
             + GetField<<R::T as TimeMarkers>::NanoSecondInput>
-            + GetField<NeverField>,
+            + GetField<()>,
     {
         FormattedDateTimePattern {
             pattern: self.inner.pattern,
@@ -2436,7 +2436,7 @@ where
             + GetField<<R::Z as ZoneMarkers>::TimeZoneOffsetInput>
             + GetField<<R::Z as ZoneMarkers>::TimeZoneVariantInput>
             + GetField<<R::Z as ZoneMarkers>::TimeZoneLocalTimeInput>
-            + GetField<NeverField>,
+            + GetField<()>,
     {
         FormattedDateTimePattern {
             pattern: self.inner.pattern,

components/datetime/src/input.rs

@@ -6,6 +6,7 @@
 //! formatting operations.
 
 use crate::neo_marker::{DateInputMarkers, GetField, TimeMarkers, ZoneMarkers};
+use crate::scaffold::IntoOption;
 use icu_calendar::any_calendar::AnyCalendarKind;
 use icu_calendar::{Date, Iso, Time};
 use icu_timezone::{TimeZoneBcp47Id, UtcOffset, ZoneVariant};
@@ -55,19 +56,19 @@ impl ExtractedInput {
             + GetField<Z::TimeZoneLocalTimeInput>,
     {
         Self {
-            year: GetField::<D::YearInput>::get_field(input).into(),
-            month: GetField::<D::MonthInput>::get_field(input).into(),
-            day_of_month: GetField::<D::DayOfMonthInput>::get_field(input).into(),
-            iso_weekday: GetField::<D::DayOfWeekInput>::get_field(input).into(),
-            any_calendar_kind: GetField::<D::AnyCalendarKindInput>::get_field(input).into(),
-            hour: GetField::<T::HourInput>::get_field(input).into(),
-            minute: GetField::<T::MinuteInput>::get_field(input).into(),
-            second: GetField::<T::SecondInput>::get_field(input).into(),
-            nanosecond: GetField::<T::NanoSecondInput>::get_field(input).into(),
-            time_zone_id: GetField::<Z::TimeZoneIdInput>::get_field(input).into(),
-            offset: GetField::<Z::TimeZoneOffsetInput>::get_field(input).into(),
-            zone_variant: GetField::<Z::TimeZoneVariantInput>::get_field(input).into(),
-            local_time: GetField::<Z::TimeZoneLocalTimeInput>::get_field(input).into(),
+            year: GetField::<D::YearInput>::get_field(input).into_option(),
+            month: GetField::<D::MonthInput>::get_field(input).into_option(),
+            day_of_month: GetField::<D::DayOfMonthInput>::get_field(input).into_option(),
+            iso_weekday: GetField::<D::DayOfWeekInput>::get_field(input).into_option(),
+            any_calendar_kind: GetField::<D::AnyCalendarKindInput>::get_field(input).into_option(),
+            hour: GetField::<T::HourInput>::get_field(input).into_option(),
+            minute: GetField::<T::MinuteInput>::get_field(input).into_option(),
+            second: GetField::<T::SecondInput>::get_field(input).into_option(),
+            nanosecond: GetField::<T::NanoSecondInput>::get_field(input).into_option(),
+            time_zone_id: GetField::<Z::TimeZoneIdInput>::get_field(input).into_option(),
+            offset: GetField::<Z::TimeZoneOffsetInput>::get_field(input).into_option(),
+            zone_variant: GetField::<Z::TimeZoneVariantInput>::get_field(input).into_option(),
+            local_time: GetField::<Z::TimeZoneLocalTimeInput>::get_field(input).into_option(),
         }
     }
 }

components/datetime/src/neo.rs

@@ -129,19 +129,19 @@ impl RawNeoOptions {
             .as_ref()
             .and_then(HourCycle::from_locale_value);
         Self {
-            length: match GetField::<FSet::LengthOption>::get_field(field_set).into() {
+            length: match GetField::<FSet::LengthOption>::get_field(field_set).into_option() {
                 Some(length) => length,
                 None => {
                     debug_assert!(false, "unreachable");
                     NeoSkeletonLength::Medium
                 }
             },
-            alignment: GetField::<FSet::AlignmentOption>::get_field(field_set).into(),
-            year_style: GetField::<FSet::YearStyleOption>::get_field(field_set).into(),
+            alignment: GetField::<FSet::AlignmentOption>::get_field(field_set).into_option(),
+            year_style: GetField::<FSet::YearStyleOption>::get_field(field_set).into_option(),
             fractional_second_digits: GetField::<FSet::FractionalSecondDigitsOption>::get_field(
                 field_set,
             )
-            .into(),
+            .into_option(),
             hour_cycle,
         }
     }
@@ -1367,7 +1367,7 @@ where
                     GetField::<<FSet::D as DateInputMarkers>::AnyCalendarKindInput>::get_field(
                         datetime,
                     )
-                    .into(),
+                    .into_option(),
             });
         }
         let datetime =