copy

Author: robertbastian

components/calendar/src/any_calendar.rs

@@ -45,7 +45,7 @@ macro_rules! make_any_calendar {
         )*
     ) => {
         $(#[$any_calendar_meta])*
-        #[derive(Debug, Clone)]
+        #[derive(Debug, Clone, Copy)]
         // TODO(#3469): Decide on the best way to implement Ord.
         pub enum $any_calendar_ident {
             $(

components/datetime/src/scaffold/calendar.rs

@@ -311,7 +311,7 @@ enum FormattableAnyCalendarKind {
 }
 
 impl FormattableAnyCalendarKind {
-    fn try_from_any_calendar(cal: &AnyCalendar) -> Option<Self> {
+    fn try_from_any_calendar(cal: AnyCalendar) -> Option<Self> {
         use AnyCalendarKind::*;
         let res = match cal.kind() {
             Buddhist => Self::Buddhist,
@@ -371,7 +371,7 @@ fn test_calendar_fallback() {
 }
 
 /// A version of [`AnyCalendar`] for the calendars supported in the any-calendar formatter.
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Copy)]
 pub(crate) struct FormattableAnyCalendar {
     any_calendar: AnyCalendar,
 }
@@ -384,7 +384,7 @@ impl FormattableAnyCalendar {
     }
 
     pub(crate) fn try_from_any_calendar(any_calendar: AnyCalendar) -> Result<Self, AnyCalendar> {
-        match FormattableAnyCalendarKind::try_from_any_calendar(&any_calendar) {
+        match FormattableAnyCalendarKind::try_from_any_calendar(any_calendar) {
             Some(_) => Ok(Self { any_calendar }),
             None => Err(any_calendar),
         }
@@ -394,8 +394,8 @@ impl FormattableAnyCalendar {
         &self.any_calendar
     }
 
-    fn kind(&self) -> FormattableAnyCalendarKind {
-        FormattableAnyCalendarKind::try_from_any_calendar(&self.any_calendar).unwrap_or_else(|| {
+    fn kind(self) -> FormattableAnyCalendarKind {
+        FormattableAnyCalendarKind::try_from_any_calendar(self.any_calendar).unwrap_or_else(|| {
             debug_assert!(false, "unreachable by invariant");
             // fall back to something non-Gregorian to make errors more obvious
             FormattableAnyCalendarKind::Coptic

ffi/capi/src/date.rs

@@ -74,7 +74,7 @@ pub mod ffi {
         #[diplomat::rust_link(icu::calendar::Date::to_calendar, FnInStruct)]
         #[diplomat::attr(demo_gen, disable)] // covered by Date
         pub fn to_calendar(&self, calendar: &Calendar) -> Box<Date> {
-            Box::new(Date(self.0.to_calendar(calendar.0.clone())))
+            Box::new(Date(self.0.to_calendar(calendar.0)))
         }
 
         #[diplomat::rust_link(icu::calendar::Date::to_any, FnInStruct)]
@@ -247,9 +247,9 @@ pub mod ffi {
             iso_day: u8,
             calendar: &Calendar,
         ) -> Result<Box<Date>, CalendarError> {
-            let cal = calendar.0.clone();
             Ok(Box::new(Date(
-                icu_calendar::Date::try_new_iso(iso_year, iso_month, iso_day)?.to_calendar(cal),
+                icu_calendar::Date::try_new_iso(iso_year, iso_month, iso_day)?
+                    .to_calendar(calendar.0),
             )))
         }
 
@@ -265,11 +265,10 @@ pub mod ffi {
             options: DateFromFieldsOptions,
             calendar: &Calendar,
         ) -> Result<Box<Date>, CalendarDateFromFieldsError> {
-            let cal = calendar.0.clone();
             Ok(Box::new(Date(icu_calendar::Date::try_from_fields(
                 fields.into(),
                 options.into(),
-                cal,
+                calendar.0,
             )?)))
         }
 
@@ -293,9 +292,8 @@ pub mod ffi {
                 None
             };
             let month = icu_calendar::types::Month::try_from_utf8(month_code)?.code();
-            let cal = calendar.0.clone();
             Ok(Box::new(Date(icu_calendar::Date::try_new_from_codes(
-                era, year, month, day, cal,
+                era, year, month, day, calendar.0,
             )?)))
         }
 
@@ -304,10 +302,9 @@ pub mod ffi {
         #[diplomat::attr(all(supports = named_constructors), named_constructor)]
         #[diplomat::demo(default_constructor)]
         pub fn from_rata_die(rd: i64, calendar: &Calendar) -> Result<Box<Date>, CalendarError> {
-            let cal = calendar.0.clone();
             Ok(Box::new(Date(icu_calendar::Date::from_rata_die(
                 icu_calendar::types::RataDie::new(rd),
-                cal,
+                calendar.0,
             ))))
         }
 
@@ -321,16 +318,15 @@ pub mod ffi {
             calendar: &Calendar,
         ) -> Result<Box<Date>, Rfc9557ParseError> {
             Ok(Box::new(Date(icu_calendar::Date::try_from_utf8(
-                v,
-                calendar.0.clone(),
+                v, calendar.0,
             )?)))
         }
 
         /// Convert this date to one in a different calendar
         #[diplomat::rust_link(icu::calendar::Date::to_calendar, FnInStruct)]
         #[diplomat::rust_link(icu::calendar::Date::convert_any, FnInStruct, hidden)]
         pub fn to_calendar(&self, calendar: &Calendar) -> Box<Date> {
-            Box::new(Date(self.0.to_calendar(calendar.0.clone())))
+            Box::new(Date(self.0.to_calendar(calendar.0)))
         }
 
         /// Converts this date to ISO
@@ -501,7 +497,7 @@ pub mod ffi {
         #[diplomat::rust_link(icu::calendar::Date::calendar_wrapper, FnInStruct, hidden)]
         #[diplomat::attr(auto, getter)]
         pub fn calendar(&self) -> Box<Calendar> {
-            Box::new(Calendar(self.0.calendar().clone()))
+            Box::new(Calendar(*self.0.calendar()))
         }
     }
 

ffi/capi/src/datetime.rs

@@ -55,7 +55,7 @@ pub mod ffi {
             calendar: &Calendar,
         ) -> Result<DateTime, Rfc9557ParseError> {
             let icu_time::DateTime { date, time } =
-                icu_time::DateTime::try_from_utf8(v, calendar.0.clone())?;
+                icu_time::DateTime::try_from_utf8(v, calendar.0)?;
             Ok(DateTime {
                 date: Box::new(Date(date)),
                 time: Box::new(Time(time)),

ffi/capi/src/zoned_datetime.rs

@@ -104,7 +104,7 @@ pub mod ffi {
             let icu_time::ZonedDateTime { date, time, zone } =
                 icu_time::ZonedDateTime::try_strict_from_utf8(
                     v,
-                    calendar.0.clone(),
+                    calendar.0,
                     iana_parser.0.as_borrowed(),
                 )?;
             Ok(ZonedDateTime {
@@ -146,7 +146,7 @@ pub mod ffi {
             let icu_time::ZonedDateTime { date, time, zone } =
                 icu_time::ZonedDateTime::try_location_only_from_utf8(
                     v,
-                    calendar.0.clone(),
+                    calendar.0,
                     iana_parser.0.as_borrowed(),
                 )?;
             Ok(ZonedDateTime {
@@ -169,7 +169,7 @@ pub mod ffi {
             calendar: &Calendar,
         ) -> Result<ZonedDateTime, Rfc9557ParseError> {
             let icu_time::ZonedDateTime { date, time, zone } =
-                icu_time::ZonedDateTime::try_offset_only_from_utf8(v, calendar.0.clone())?;
+                icu_time::ZonedDateTime::try_offset_only_from_utf8(v, calendar.0)?;
             Ok(ZonedDateTime {
                 date: Box::new(Date(date)),
                 time: Box::new(Time(time)),
@@ -189,7 +189,7 @@ pub mod ffi {
             let icu_time::ZonedDateTime { date, time, zone } =
                 icu_time::ZonedDateTime::try_lenient_from_utf8(
                     v,
-                    calendar.0.clone(),
+                    calendar.0,
                     iana_parser.0.as_borrowed(),
                 )?;
             Ok(ZonedDateTime {