Replace Date::try_new_from_codes where possible (#7572)

Author: robertbastian

components/calendar/benches/date.rs

@@ -152,15 +152,15 @@ fn date_benches(c: &mut Criterion) {
         "calendar/chinese_cached",
         &fxs,
         icu::calendar::cal::ChineseTraditional::new(),
-        |y, m, d, c| Date::try_new_from_codes(None, y, types::Month::new(m).code(), d, c).unwrap(),
+        |y, m, d, _| Date::try_new_chinese_traditional(y, types::Month::new(m), d).unwrap(),
     );
 
     bench_calendar(
         &mut group,
         "calendar/dangi_cached",
         &fxs,
         icu::calendar::cal::KoreanTraditional::new(),
-        |y, m, d, c| Date::try_new_from_codes(None, y, types::Month::new(m).code(), d, c).unwrap(),
+        |y, m, d, _| Date::try_new_korean_traditional(y, types::Month::new(m), d).unwrap(),
     );
 
     bench_calendar(

components/calendar/src/cal/east_asian_traditional.rs

@@ -858,7 +858,7 @@ impl Date<ChineseTraditional> {
 impl<A: AsCalendar<Calendar = ChineseTraditional>> Date<A> {
     /// This method uses an ordinal month, which is probably not what you want.
     ///
-    /// Use [`Date::try_new_from_codes`]
+    /// Use [`Date::try_new_chinese_traditional`]
     #[deprecated(since = "2.1.0", note = "use `Date::try_new_chinese_traditional`")]
     pub fn try_new_chinese_with_calendar(
         related_iso_year: i32,
@@ -1343,14 +1343,7 @@ mod test {
         ];
 
         for case in cases {
-            let date = Date::try_new_from_codes(
-                None,
-                case.year,
-                case.month.code(),
-                case.day,
-                ChineseTraditional::new(),
-            )
-            .unwrap();
+            let date = Date::try_new_chinese_traditional(case.year, case.month, case.day).unwrap();
             #[allow(deprecated)] // should still test
             {
                 assert_eq!(
@@ -1838,14 +1831,8 @@ mod test {
                     day_or_lunar_month.parse().unwrap()
                 };
 
-                let chinese = Date::try_new_from_codes(
-                    None,
-                    related_iso,
-                    lunar_month.code(),
-                    lunar_day,
-                    ChineseTraditional::new(),
-                )
-                .unwrap();
+                let chinese =
+                    Date::try_new_korean_traditional(related_iso, lunar_month, lunar_day).unwrap();
 
                 assert_eq!(
                     gregorian,
@@ -1859,13 +1846,13 @@ mod test {
     #[test]
     #[ignore] // network
     fn test_against_kasi_data() {
-        use crate::{cal::Gregorian, types::MonthCode, Date};
+        use crate::{cal::Gregorian, Date};
 
         // TODO: query KASI directly
         let uri = "https://gist.githubusercontent.com/Manishearth/d8c94a7df22a9eacefc4472a5805322e/raw/e1ea3b0aa52428686bb3a9cd0f262878515e16c1/resolved.json";
 
         #[derive(serde::Deserialize)]
-        struct Golden(BTreeMap<i32, BTreeMap<MonthCode, MonthData>>);
+        struct Golden(BTreeMap<i32, BTreeMap<String, MonthData>>);
 
         #[derive(serde::Deserialize)]
         struct MonthData {
@@ -1881,11 +1868,11 @@ mod test {
 
         let golden = serde_json::from_str::<Golden>(&json).unwrap();
 
-        for (&year, months) in &golden.0 {
+        for (year, months) in golden.0 {
             if year == 1899 || year == 2050 {
                 continue;
             }
-            for (&month, month_data) in months {
+            for (month_code, month_data) in months {
                 let mut gregorian = month_data.start_date.split('-');
                 let gregorian = Date::try_new_gregorian(
                     gregorian.next().unwrap().parse().unwrap(),
@@ -1895,9 +1882,13 @@ mod test {
                 .unwrap();
 
                 assert_eq!(
-                    Date::try_new_from_codes(None, year, month, 1, KoreanTraditional::new())
-                        .unwrap()
-                        .to_calendar(Gregorian),
+                    Date::try_new_korean_traditional(
+                        year,
+                        Month::try_from_str(&month_code).unwrap(),
+                        1
+                    )
+                    .unwrap()
+                    .to_calendar(Gregorian),
                     gregorian
                 );
             }

components/calendar/src/cal/hebrew.rs

@@ -549,10 +549,7 @@ mod tests {
     #[test]
     fn test_weekdays() {
         // https://github.com/unicode-org/icu4x/issues/4893
-        let cal = Hebrew::new();
-        let era = "am";
-        let month = Month::new(1);
-        let dt = Date::try_new_from_codes(Some(era), 3760, month.code(), 1, cal).unwrap();
+        let dt = Date::try_new_hebrew_v2(3760, Month::new(1), 1).unwrap();
 
         // Should be Saturday per:
         // https://www.hebcal.com/converter?hd=1&hm=Tishrei&hy=3760&h2g=1

components/calendar/src/date.rs

@@ -99,9 +99,9 @@ impl<C> Deref for Ref<'_, C> {
 /// This can work with wrappers around [`Calendar`] types,
 /// e.g. `Rc<C>`, via the [`AsCalendar`] trait.
 ///
-/// This can be constructed  constructed
-/// from its fields via [`Self::try_new_from_codes()`], or can be constructed with one of the
-/// `new_<calendar>_date()` per-calendar methods (and then freely converted between calendars).
+/// This can be constructed from its fields via [`Self::try_new_from_codes()`], or can be
+/// constructed with one of the `new_<calendar>_date()` per-calendar methods (and then
+/// freely converted between calendars).
 ///
 /// ```rust
 /// use icu::calendar::Date;

components/calendar/src/tests/continuity_test.rs

@@ -65,18 +65,17 @@ fn test_buddhist_continuity() {
 
 #[test]
 fn test_chinese_continuity() {
-    let cal = cal::ChineseTraditional::new();
-    let date = Date::try_new_from_codes(None, -10, Month::new(1).code(), 1, cal);
+    let date = Date::try_new_chinese_traditional(-10, Month::new(1), 1);
     check_continuity(date.unwrap(), 20);
-    let date = Date::try_new_from_codes(None, -300, Month::new(1).code(), 1, cal);
+    let date = Date::try_new_chinese_traditional(-300, Month::new(1), 1);
     check_every_250_days(date.unwrap(), 2000);
-    let date = Date::try_new_from_codes(None, -10000, Month::new(1).code(), 1, cal);
+    let date = Date::try_new_chinese_traditional(-10000, Month::new(1), 1);
     check_every_250_days(date.unwrap(), 2000);
 
-    let date = Date::try_new_from_codes(None, 1899, Month::new(1).code(), 1, cal);
+    let date = Date::try_new_chinese_traditional(1899, Month::new(1), 1);
     check_continuity(date.unwrap(), 20);
 
-    let date = Date::try_new_from_codes(None, 2099, Month::new(1).code(), 1, cal);
+    let date = Date::try_new_chinese_traditional(2099, Month::new(1), 1);
     check_continuity(date.unwrap(), 20);
 }
 
@@ -90,16 +89,15 @@ fn test_coptic_continuity() {
 
 #[test]
 fn test_korean_continuity() {
-    let cal = cal::KoreanTraditional::new();
-    let date = Date::try_new_from_codes(None, -10, Month::new(1).code(), 1, cal);
+    let date = Date::try_new_korean_traditional(-10, Month::new(1), 1);
     check_continuity(date.unwrap(), 20);
-    let date = Date::try_new_from_codes(None, -300, Month::new(1).code(), 1, cal);
+    let date = Date::try_new_korean_traditional(-300, Month::new(1), 1);
     check_every_250_days(date.unwrap(), 2000);
 
-    let date = Date::try_new_from_codes(None, 1900, Month::new(1).code(), 1, cal);
+    let date = Date::try_new_korean_traditional(1900, Month::new(1), 1);
     check_continuity(date.unwrap(), 20);
 
-    let date = Date::try_new_from_codes(None, 2100, Month::new(1).code(), 1, cal);
+    let date = Date::try_new_korean_traditional(2100, Month::new(1), 1);
     check_continuity(date.unwrap(), 20);
 }
 
@@ -131,9 +129,9 @@ fn test_gregorian_continuity() {
 
 #[test]
 fn test_hebrew_continuity() {
-    let date = Date::try_new_from_codes(None, -10, Month::new(1).code(), 1, cal::Hebrew);
+    let date = Date::try_new_hebrew_v2(-10, Month::new(1), 1);
     check_continuity(date.unwrap(), 20);
-    let date = Date::try_new_from_codes(None, -300, Month::new(1).code(), 1, cal::Hebrew);
+    let date = Date::try_new_hebrew_v2(-300, Month::new(1), 1);
     check_every_250_days(date.unwrap(), 2000);
 }
 

components/calendar/tests/arithmetic.rs

@@ -144,13 +144,13 @@ fn test_arithmetic_cases() {
 
 #[test]
 fn test_hebrew() {
-    let m06z_20 = Date::try_new_from_codes(None, 5783, Month::new(6).code(), 20, Hebrew).unwrap();
-    let m05l_15 = Date::try_new_from_codes(None, 5784, Month::leap(5).code(), 15, Hebrew).unwrap();
-    let m05l_30 = Date::try_new_from_codes(None, 5784, Month::leap(5).code(), 30, Hebrew).unwrap();
-    let m06a_29 = Date::try_new_from_codes(None, 5784, Month::new(6).code(), 29, Hebrew).unwrap();
-    let m07a_10 = Date::try_new_from_codes(None, 5784, Month::new(7).code(), 10, Hebrew).unwrap();
-    let m06b_15 = Date::try_new_from_codes(None, 5785, Month::new(6).code(), 15, Hebrew).unwrap();
-    let m07b_20 = Date::try_new_from_codes(None, 5785, Month::new(7).code(), 20, Hebrew).unwrap();
+    let m06z_20 = Date::try_new_hebrew_v2(5783, Month::new(6), 20).unwrap();
+    let m05l_15 = Date::try_new_hebrew_v2(5784, Month::leap(5), 15).unwrap();
+    let m05l_30 = Date::try_new_hebrew_v2(5784, Month::leap(5), 30).unwrap();
+    let m06a_29 = Date::try_new_hebrew_v2(5784, Month::new(6), 29).unwrap();
+    let m07a_10 = Date::try_new_hebrew_v2(5784, Month::new(7), 10).unwrap();
+    let m06b_15 = Date::try_new_hebrew_v2(5785, Month::new(6), 15).unwrap();
+    let m07b_20 = Date::try_new_hebrew_v2(5785, Month::new(7), 20).unwrap();
 
     #[rustfmt::skip]
     #[allow(clippy::type_complexity)]