Change .time, .zone to .with_time, .with_zone (#6471)

#6022

Author: sffc

components/datetime/README.md

@@ -78,7 +78,7 @@
 //! let static_field_set = fieldsets::T::short()
 //!     .with_time_precision(TimePrecision::Subsecond(SubsecondDigits::S3))
 //!     .with_alignment(Alignment::Column)
-//!     .zone(fieldsets::zone::SpecificLong);
+//!     .with_zone(fieldsets::zone::SpecificLong);
 //!
 //! let mut builder = FieldSetBuilder::new();
 //! builder.length = Some(Length::Short);
@@ -604,7 +604,7 @@ impl FieldSetBuilder {
     pub fn build_zoned_date(mut self) -> Result<ZonedDateFieldSet, BuilderError> {
         let zone_field_set = self.build_zone_without_checking_options()?;
         let date_field_set = self.build_date()?;
-        Ok(date_field_set.zone(zone_field_set))
+        Ok(date_field_set.with_zone(zone_field_set))
     }
 
     /// Builds a [`Combo`] for a zoned time.
@@ -613,7 +613,7 @@ impl FieldSetBuilder {
     pub fn build_zoned_time(mut self) -> Result<ZonedTimeFieldSet, BuilderError> {
         let zone_field_set = self.build_zone_without_checking_options()?;
         let time_field_set = self.build_time()?;
-        Ok(time_field_set.zone(zone_field_set))
+        Ok(time_field_set.with_zone(zone_field_set))
     }
 
     /// Builds a [`Combo`] for a zoned date and time.
@@ -622,7 +622,7 @@ impl FieldSetBuilder {
     pub fn build_zoned_date_and_time(mut self) -> Result<ZonedDateAndTimeFieldSet, BuilderError> {
         let zone_field_set = self.build_zone_without_checking_options()?;
         let datetime_field_set = self.build_date_and_time()?;
-        Ok(datetime_field_set.zone(zone_field_set))
+        Ok(datetime_field_set.with_zone(zone_field_set))
     }
 
     /// Builds a [`CompositeFieldSet`].

components/datetime/src/builder.rs

@@ -16,7 +16,7 @@ use crate::{provider::neo::*, scaffold::*};
 /// ```
 /// use icu::datetime::fieldsets::{zone::Location, Combo, E};
 ///
-/// let field_set = E::long().zone(Location);
+/// let field_set = E::long().with_zone(Location);
 /// ```
 ///
 /// Format the weekday, hour, and location-based zone:
@@ -32,7 +32,7 @@ use crate::{provider::neo::*, scaffold::*};
 /// // Note: Combo type can be elided, but it is shown here for demonstration
 /// let formatter = DateTimeFormatter::<Combo<fieldsets::ET, zone::Location>>::try_new(
 ///     locale!("en-US").into(),
-///     fieldsets::E::short().time_hm().zone(zone::Location),
+///     fieldsets::E::short().with_time_hm().with_zone(zone::Location),
 /// )
 /// .unwrap();
 ///
@@ -64,7 +64,7 @@ use crate::{provider::neo::*, scaffold::*};
 /// let formatter =
 ///     FixedCalendarDateTimeFormatter::<_, Combo<fieldsets::ET, zone::Location>>::try_new(
 ///         locale!("en-US").into(),
-///         fieldsets::E::short().time_hm().zone(zone::Location),
+///         fieldsets::E::short().with_time_hm().with_zone(zone::Location),
 ///     )
 ///     .unwrap();
 ///
@@ -98,7 +98,7 @@ use crate::{provider::neo::*, scaffold::*};
 /// let formatter =
 ///     DateTimeFormatter::<Combo<DateFieldSet, GenericShort>>::try_new(
 ///         locale!("en-US").into(),
-///         DateFieldSet::YMD(YMD::long()).zone(GenericShort),
+///         DateFieldSet::YMD(YMD::long()).with_zone(GenericShort),
 ///     )
 ///     .unwrap();
 ///
@@ -125,7 +125,7 @@ use crate::{provider::neo::*, scaffold::*};
 ///
 /// let formatter = FixedCalendarDateTimeFormatter::try_new(
 ///     locale!("en-US").into(),
-///     T::medium().zone(SpecificLong),
+///     T::medium().with_zone(SpecificLong),
 /// )
 /// .unwrap();
 ///

components/datetime/src/combo.rs

@@ -38,7 +38,7 @@
 //!
 //! fn get_field_set(should_display_time: bool) -> CompositeDateTimeFieldSet {
 //!     if should_display_time {
-//!         let field_set = fieldsets::MD::medium().time_hm();
+//!         let field_set = fieldsets::MD::medium().with_time_hm();
 //!         CompositeDateTimeFieldSet::DateTime(
 //!             fieldsets::enums::DateAndTimeFieldSet::MDT(field_set),
 //!         )

components/datetime/src/dynamic.rs

@@ -294,7 +294,7 @@ macro_rules! impl_date_to_time_helpers {
     ) => {
         impl $type {
             /// Associates this field set with a time precision.
-            pub fn time(self, time_precision: TimePrecision) -> $type_time {
+            pub fn with_time(self, time_precision: TimePrecision) -> $type_time {
                 $type_time {
                     length: self.length,
                     time_precision: Some(time_precision),
@@ -303,7 +303,7 @@ macro_rules! impl_date_to_time_helpers {
                 }
             }
             /// Shorthand to associate this field set with [`TimePrecision::Minute`].
-            pub fn time_hm(self) -> $type_time {
+            pub fn with_time_hm(self) -> $type_time {
                 $type_time {
                     length: self.length,
                     time_precision: Some(TimePrecision::Minute),
@@ -312,7 +312,7 @@ macro_rules! impl_date_to_time_helpers {
                 }
             }
             /// Shorthand to associate this field set with [`TimePrecision::Second`].
-            pub fn time_hms(self) -> $type_time {
+            pub fn with_time_hms(self) -> $type_time {
                 $type_time {
                     length: self.length,
                     time_precision: Some(TimePrecision::Second),
@@ -353,7 +353,7 @@ macro_rules! impl_zone_combo_helpers {
         impl $type {
             #[inline]
             /// Associates this field set with a time zone field set.
-            pub fn zone<Z: ZoneMarkers>(self, zone: Z) -> Combo<Self, Z> {
+            pub fn with_zone<Z: ZoneMarkers>(self, zone: Z) -> Combo<Self, Z> {
                 Combo::new(self, zone)
             }
         }
@@ -1311,7 +1311,7 @@ pub mod zone {
         ///
         /// let formatter = FixedCalendarDateTimeFormatter::try_new(
         ///     locale!("en-US").into(),
-        ///     T::medium().zone(SpecificShort),
+        ///     T::medium().with_zone(SpecificShort),
         /// )
         /// .unwrap();
         ///

components/datetime/src/fieldsets.rs

@@ -57,7 +57,7 @@
 //! use writeable::assert_writeable_eq;
 //!
 //! // Field set for year, month, day, hour, and minute with a medium length:
-//! let field_set = fieldsets::YMD::medium().time_hm();
+//! let field_set = fieldsets::YMD::medium().with_time_hm();
 //!
 //! // Create a formatter for Argentinian Spanish:
 //! let locale = locale!("es-AR");

components/datetime/src/lib.rs

@@ -943,7 +943,7 @@ impl<C: CldrCalendar, FSet: DateTimeMarkers> FixedCalendarDateTimeFormatter<C, F
     /// // Create a simple YMDT formatter:
     /// let formatter = FixedCalendarDateTimeFormatter::try_new(
     ///     locale!("und").into(),
-    ///     YMD::long().time_hm().with_alignment(Alignment::Column)
+    ///     YMD::long().with_time_hm().with_alignment(Alignment::Column)
     /// )
     /// .unwrap();
     ///

components/datetime/src/neo.rs

@@ -22,7 +22,7 @@
 //!
 //! let dtf = DateTimeFormatter::try_new(
 //!     locale!("en-u-ca-buddhist").into(),
-//!     fieldsets::YMDT::medium().with_time_precision(TimePrecision::Subsecond(SubsecondDigits::S2)).zone(fieldsets::zone::SpecificShort),
+//!     fieldsets::YMDT::medium().with_time_precision(TimePrecision::Subsecond(SubsecondDigits::S2)).with_zone(fieldsets::zone::SpecificShort),
 //! )
 //! .unwrap();
 //!

components/datetime/src/parts.rs

@@ -847,7 +847,7 @@ impl<C: CldrCalendar, FSet: DateTimeNamesMarker> FixedCalendarDateTimeNames<C, F
     /// // This assumes that the locale uses Abbreviated names for the given semantic skeleton!
     /// let mut names = FixedCalendarDateTimeNames::from_formatter(prefs, formatter).cast_into_fset::<YMDT>();
     /// names.include_day_period_names(DayPeriodNameLength::Abbreviated).unwrap();
-    /// let formatter = names.try_into_formatter(YMD::long().time_hm()).unwrap();
+    /// let formatter = names.try_into_formatter(YMD::long().with_time_hm()).unwrap();
     ///
     /// assert_writeable_eq!(
     ///     formatter.format(&DateTime {
@@ -1035,7 +1035,7 @@ impl<FSet: DateTimeNamesMarker> DateTimeNames<FSet> {
     /// // This assumes that the locale uses Abbreviated names for the given semantic skeleton!
     /// let mut names = DateTimeNames::from_formatter(prefs, formatter).cast_into_fset::<YMDT>();
     /// names.as_mut().include_day_period_names(DayPeriodNameLength::Abbreviated).unwrap();
-    /// let formatter = names.try_into_formatter(YMD::long().time_hm()).unwrap();
+    /// let formatter = names.try_into_formatter(YMD::long().with_time_hm()).unwrap();
     ///
     /// assert_writeable_eq!(
     ///     formatter.format(&DateTime {

components/datetime/src/pattern/names.rs

@@ -40,7 +40,7 @@ fn main() {
     // A English, Japanese calendar, medium-length, year-month-day-time-specific-zone formatter
     let formatter = DateTimeFormatter::try_new(
         locale!("en-GB-u-ca-japanese").into(),
-        fieldsets::YMDT::medium().zone(fieldsets::zone::SpecificLong),
+        fieldsets::YMDT::medium().with_zone(fieldsets::zone::SpecificLong),
     )
     .expect("data is present");