flatten DateFromFieldsError::Range

Author: robertbastian

components/calendar/src/error.rs

@@ -108,7 +108,6 @@ pub enum DateFromFieldsError {
     /// ```
     /// use icu_calendar::Date;
     /// use icu_calendar::error::DateFromFieldsError;
-    /// use icu_calendar::error::RangeError;
     /// use icu_calendar::Iso;
     /// use icu_calendar::types::DateFields;
     ///
@@ -122,10 +121,20 @@ pub enum DateFromFieldsError {
     /// )
     /// .expect_err("no month 13 in the ISO calendar");
     ///
-    /// assert!(matches!(err, DateFromFieldsError::Range(RangeError { field: "month", .. })));
+    /// assert!(matches!(err, DateFromFieldsError::Range { field: "month", .. }));
     /// ```
-    #[displaydoc("{0}")]
-    Range(RangeError),
+    #[displaydoc("The {field} = {value} argument is out of range {min}..={max}")]
+    #[non_exhaustive]
+    Range {
+        /// The field that is out of range, such as "year"
+        field: &'static str,
+        /// The actual value
+        value: i32,
+        /// The minimum value (inclusive). This might not be tight.
+        min: i32,
+        /// The maximum value (inclusive). This might not be tight.
+        max: i32,
+    },
     /// The era code is invalid for the calendar.
     #[displaydoc("Unknown era or invalid syntax")]
     UnknownEra,
@@ -343,13 +352,6 @@ pub enum DateFromFieldsError {
 
 impl core::error::Error for DateFromFieldsError {}
 
-impl From<RangeError> for DateFromFieldsError {
-    #[inline]
-    fn from(value: RangeError) -> Self {
-        DateFromFieldsError::Range(value)
-    }
-}
-
 /// Internal narrow error type for functions that only fail on unknown eras
 pub(crate) struct UnknownEraError;
 
@@ -473,6 +475,24 @@ impl From<RangeError> for DateError {
     }
 }
 
+impl From<RangeError> for DateFromFieldsError {
+    #[inline]
+    fn from(value: RangeError) -> Self {
+        let RangeError {
+            field,
+            value,
+            min,
+            max,
+        } = value;
+        DateFromFieldsError::Range {
+            field,
+            value,
+            min,
+            max,
+        }
+    }
+}
+
 pub(crate) fn range_check_with_overflow<T: Ord + Into<i32> + Copy>(
     value: T,
     field: &'static str,

ffi/capi/src/errors.rs

@@ -204,7 +204,7 @@ impl From<icu_calendar::DateError> for CalendarError {
 impl From<icu_calendar::error::DateFromFieldsError> for CalendarDateFromFieldsError {
     fn from(e: icu_calendar::error::DateFromFieldsError) -> Self {
         match e {
-            icu_calendar::error::DateFromFieldsError::Range(_) => Self::OutOfRange,
+            icu_calendar::error::DateFromFieldsError::Range { .. }  => Self::OutOfRange,
             icu_calendar::error::DateFromFieldsError::UnknownEra => Self::UnknownEra,
             icu_calendar::error::DateFromFieldsError::MonthCodeInvalidSyntax => {
                 Self::MonthCodeInvalidSyntax