Rename wrap_calendar_in APIs (#6392)

Fixes #6027

<!--
Thank you for your pull request to ICU4X!

Reminder: try to use [Conventional
Comments](https://conventionalcomments.org/) to make comments clearer.

Please see
https://github.com/unicode-org/icu4x/blob/main/CONTRIBUTING.md for
general
information on contributing to ICU4X.
-->

---------

Co-authored-by: Robert Bastian <[email protected]>

Author: Manishearth

CHANGELOG.md

@@ -17,6 +17,7 @@ Some major changes worth highlighting:
         - Rename `Islamic` calendars to `Hijri` (unicode-org#6214)
         - Collapse `IslamicCivil` into `IslamicTabular` (unicode-org#6384)
         - Rename `IslamicObservational` to `IslamicSimulated`
+        - Rename `wrap_calendar_in_*` APIs to `as_borrowed`, `into_ref_counted`, `into_atomic_ref_counted` (unicode-org#6392)
     - `icu_collections`
         - Remove some panics from `CodePointTrie`, which should no longer pull in panic machinery even with arithmetic panics enabled for lookup (unicode-org#6204)
 - Data model and providers

components/calendar/src/date.rs

@@ -353,23 +353,23 @@ impl<A: AsCalendar> Date<A> {
     ///
     /// Useful when paired with [`Self::to_any()`] to obtain a `Date<Rc<AnyCalendar>>`
     #[cfg(feature = "alloc")]
-    pub fn wrap_calendar_in_rc(self) -> Date<Rc<A>> {
+    pub fn into_ref_counted(self) -> Date<Rc<A>> {
         Date::from_raw(self.inner, Rc::new(self.calendar))
     }
 
     /// Wrap the calendar type in `Arc<T>`
     ///
-    /// Useful when paired with [`Self::to_any()`] to obtain a `Date<Rc<AnyCalendar>>`
+    /// Useful when paired with [`Self::to_any()`] to obtain a `Date<Arc<AnyCalendar>>`
     #[cfg(feature = "alloc")]
-    pub fn wrap_calendar_in_arc(self) -> Date<Arc<A>> {
+    pub fn into_atomic_ref_counted(self) -> Date<Arc<A>> {
         Date::from_raw(self.inner, Arc::new(self.calendar))
     }
 
     /// Wrap the calendar type in `Ref<T>`
     ///
     /// Useful for converting a `&Date<C>` into an equivalent `Date<D>` without cloning
     /// the calendar.
-    pub fn wrap_calendar_in_ref(&self) -> Date<Ref<A>> {
+    pub fn as_borrowed(&self) -> Date<Ref<A>> {
         Date::from_raw(self.inner, Ref(&self.calendar))
     }
 }

ffi/capi/src/date.rs

@@ -74,7 +74,7 @@ pub mod ffi {
 
         #[diplomat::rust_link(icu::calendar::Date::to_any, FnInStruct)]
         pub fn to_any(&self) -> Box<Date> {
-            Box::new(Date(self.0.to_any().wrap_calendar_in_arc()))
+            Box::new(Date(self.0.to_any().into_atomic_ref_counted()))
         }
 
         /// Returns this date's Rata Die

ffi/capi/src/date_formatter.rs

@@ -639,7 +639,7 @@ pub mod ffi {
             date: &Date,
             write: &mut diplomat_runtime::DiplomatWrite,
         ) -> Result<(), DateTimeMismatchedCalendarError> {
-            let date = date.0.wrap_calendar_in_ref();
+            let date = date.0.as_borrowed();
             let value = date;
             let _infallible = self.0.format_same_calendar(&value)?.write_to(write);
             Ok(())

ffi/capi/src/date_time_formatter.rs

@@ -510,7 +510,7 @@ pub mod ffi {
             time: &Time,
             write: &mut diplomat_runtime::DiplomatWrite,
         ) -> Result<(), DateTimeMismatchedCalendarError> {
-            let date = date.0.wrap_calendar_in_ref();
+            let date = date.0.as_borrowed();
             let value = icu_time::DateTime {
                 date,
                 time: time.0,

tools/make/codegen/templates/datetime_formatter.rs.jinja

@@ -187,7 +187,7 @@ pub mod ffi {
             {%- endif %}
             write: &mut diplomat_runtime::DiplomatWrite,
         ) -> Result<(), DateTimeMismatchedCalendarError> {
-            let date = date.0.wrap_calendar_in_ref();
+            let date = date.0.as_borrowed();
             {%- if flavor.has_time() %}
             let value = icu_time::DateTime {
                 date,

tools/make/diplomat-coverage/src/allowlist.rs

@@ -341,9 +341,9 @@ lazy_static::lazy_static! {
         "icu::datetime::DateTimeFormatter::cast_into_fset",
         "icu::datetime::FixedCalendarDateTimeFormatter::cast_into_fset",
         // TODO-2.0: needs investigation
-        "icu::calendar::Date::wrap_calendar_in_rc",
-        "icu::calendar::Date::wrap_calendar_in_arc",
-        "icu::calendar::Date::wrap_calendar_in_ref",
+        "icu::calendar::Date::into_ref_counted",
+        "icu::calendar::Date::into_atomic_ref_counted",
+        "icu::calendar::Date::as_borrowed",
 
         // Generic type, primarily exists for use by ICU4X data struct internals.
         "icu::plurals::PluralElements",