More DateTime FFI rustlink and export fixes (#6501)

Toward #5940

Author: sffc

components/datetime/src/error.rs

@@ -133,14 +133,3 @@ pub enum DateTimeWriteError {
 }
 
 impl core::error::Error for DateTimeWriteError {}
-
-/// Error returned from constructors that map from AnyCalendar to a formatter.
-#[derive(Debug, Clone, Copy, PartialEq, displaydoc::Display)]
-#[displaydoc("The calendar {kind:?} is not supported in DateTimeFormatter")]
-#[non_exhaustive]
-pub struct UnsupportedCalendarError {
-    /// The calendar kind that is not supported.
-    pub kind: AnyCalendarKind,
-}
-
-impl core::error::Error for UnsupportedCalendarError {}

components/datetime/src/lib.rs

@@ -106,10 +106,7 @@ pub(crate) mod raw;
 pub mod scaffold;
 pub(crate) mod size_test_macro;
 
-pub use error::{
-    DateTimeFormatterLoadError, DateTimeWriteError, MismatchedCalendarError,
-    UnsupportedCalendarError,
-};
+pub use error::{DateTimeFormatterLoadError, DateTimeWriteError, MismatchedCalendarError};
 
 pub use format::DateTimeInputUnchecked;
 pub use neo::DateTimeFormatter;

components/datetime/src/pattern/mod.rs

@@ -18,6 +18,7 @@ mod pattern;
 pub use crate::error::ErrorField;
 pub use formatter::DateTimePatternFormatter;
 pub use formatter::FormattedDateTimePattern;
+use icu_calendar::AnyCalendarKind;
 use icu_pattern::SinglePlaceholderPattern;
 pub use names::DateTimeNames;
 pub(crate) use names::DateTimeNamesMetadata;
@@ -98,3 +99,14 @@ pub enum PatternLoadError {
 }
 
 impl core::error::Error for PatternLoadError {}
+
+/// Error returned from constructors that map from AnyCalendar to a formatter.
+#[derive(Debug, Clone, Copy, PartialEq, displaydoc::Display)]
+#[displaydoc("The calendar {kind:?} is not supported in DateTimeFormatter")]
+#[non_exhaustive]
+pub struct UnsupportedCalendarError {
+    /// The calendar kind that is not supported.
+    pub kind: AnyCalendarKind,
+}
+
+impl core::error::Error for UnsupportedCalendarError {}

components/datetime/src/pattern/names.rs

@@ -5,9 +5,9 @@
 use super::{
     DateTimePattern, DateTimePatternFormatter, GetNameForCyclicYearError, GetNameForDayPeriodError,
     GetNameForEraError, GetNameForMonthError, GetNameForWeekdayError, MonthPlaceholderValue,
-    PatternLoadError,
+    PatternLoadError, UnsupportedCalendarError,
 };
-use crate::error::{ErrorField, UnsupportedCalendarError};
+use crate::error::ErrorField;
 use crate::fieldsets::enums::{CompositeDateTimeFieldSet, CompositeFieldSet};
 use crate::provider::fields::{self, FieldLength, FieldSymbol};
 use crate::provider::neo::{marker_attrs, *};

ffi/capi/bindings/cpp/icu4x/TimeFormatter.d.hpp

@@ -40,7 +40,7 @@ pub mod ffi {
 
     impl TimeFormatter {
         #[diplomat::attr(supports = fallible_constructors, constructor)]
-        #[diplomat::rust_link(icu::datetime::NoCalendarFormatter::try_new, FnInStruct)]
+        #[diplomat::rust_link(icu::datetime::NoCalendarFormatter::try_new, FnInTypedef)]
         #[diplomat::rust_link(icu::datetime::fieldsets::T, Struct)]
         #[diplomat::rust_link(icu::datetime::fieldsets::T::hm, FnInStruct, hidden)]
         #[diplomat::rust_link(icu::datetime::fieldsets::T::hms, FnInStruct, hidden)]
@@ -81,7 +81,7 @@ pub mod ffi {
         }
 
         #[diplomat::attr(all(supports = fallible_constructors, supports = named_constructors), named_constructor = "with_provider")]
-        #[diplomat::rust_link(icu::datetime::NoCalendarFormatter::try_new, FnInStruct)]
+        #[diplomat::rust_link(icu::datetime::NoCalendarFormatter::try_new, FnInTypedef)]
         #[diplomat::rust_link(icu::datetime::fieldsets::T, Struct)]
         #[diplomat::rust_link(icu::datetime::fieldsets::T::hm, FnInStruct, hidden)]
         #[diplomat::rust_link(icu::datetime::fieldsets::T::hms, FnInStruct, hidden)]
@@ -122,7 +122,7 @@ pub mod ffi {
             )))
         }
 
-        #[diplomat::rust_link(icu::datetime::FixedCalendarDateTimeFormatter::format, FnInStruct)]
+        #[diplomat::rust_link(icu::datetime::NoCalendarFormatter::format, FnInTypedef)]
         #[diplomat::rust_link(icu::datetime::FormattedDateTime, Struct, hidden)]
         #[diplomat::rust_link(icu::datetime::FormattedDateTime::to_string, FnInStruct, hidden)]
         pub fn format(

ffi/capi/bindings/dart/TimeFormatter.g.dart

@@ -15,13 +15,6 @@
 
 
 fixed_decimal::Decimal::new#FnInTypedef
-icu::datetime::NoCalendarFormatter::cast_into_fset#FnInTypedef
-icu::datetime::NoCalendarFormatter::format#FnInTypedef
-icu::datetime::NoCalendarFormatter::format_unchecked#FnInTypedef
-icu::datetime::NoCalendarFormatter::into_formatter#FnInTypedef
-icu::datetime::NoCalendarFormatter::to_field_set_builder#FnInTypedef
-icu::datetime::NoCalendarFormatter::try_new#FnInTypedef
-icu::datetime::UnsupportedCalendarError#Struct
 icu::datetime::options::SubsecondError#Enum
 icu_provider_adapters::fork::ForkByMarkerProvider::inner#FnInTypedef
 icu_provider_adapters::fork::ForkByMarkerProvider::inner_mut#FnInTypedef