Skip to content

Commit 3dfa73e

Browse files
robertbastianrobertbastian
committed
related_iso
1 parent ccfb1d9 commit 3dfa73e

File tree

24 files changed

+45
-139
lines changed

24 files changed

+45
-139
lines changed

‎components/calendar/src/cal/buddhist.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl GregorianYears for BuddhistEra {
6666
era: tinystr!(16, "be"),
6767
era_index: Some(0),
6868
year: extended_year,
69-
related_gregorian,
69+
related_iso: related_gregorian,
7070
extended_year,
7171
ambiguity: types::YearAmbiguity::CenturyRequired,
7272
}

‎components/calendar/src/cal/coptic.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ impl Calendar for Coptic {
208208
era: tinystr!(16, "am"),
209209
era_index: Some(0),
210210
year,
211-
related_gregorian,
211+
related_iso: related_gregorian,
212212
extended_year: year,
213213
ambiguity: types::YearAmbiguity::CenturyRequired,
214214
}
@@ -302,15 +302,15 @@ mod tests {
302302
.unwrap()
303303
.to_calendar(Coptic)
304304
.era_year()
305-
.related_gregorian,
305+
.related_iso,
306306
2024
307307
);
308308
assert_eq!(
309309
Date::try_new_gregorian(2025, 9, 18)
310310
.unwrap()
311311
.to_calendar(Coptic)
312312
.era_year()
313-
.related_gregorian,
313+
.related_iso,
314314
2025
315315
);
316316

@@ -320,14 +320,14 @@ mod tests {
320320
Date::try_new_coptic(16419, 1, 1)
321321
.unwrap()
322322
.era_year()
323-
.related_gregorian,
323+
.related_iso,
324324
16702
325325
);
326326
assert_eq!(
327327
Date::try_new_coptic(16420, 1, 1)
328328
.unwrap()
329329
.era_year()
330-
.related_gregorian,
330+
.related_iso,
331331
16704
332332
);
333333
}

‎components/calendar/src/cal/ethiopian.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl Calendar for Ethiopian {
219219
era: tinystr!(16, "aa"),
220220
era_index: Some(0),
221221
year: coptic_year.year - AMETE_ALEM_OFFSET,
222-
related_gregorian: coptic_year.related_gregorian,
222+
related_iso: coptic_year.related_iso,
223223
extended_year,
224224
ambiguity: types::YearAmbiguity::CenturyRequired,
225225
}
@@ -228,7 +228,7 @@ impl Calendar for Ethiopian {
228228
era: tinystr!(16, "am"),
229229
era_index: Some(1),
230230
year: coptic_year.year - AMETE_MIHRET_OFFSET,
231-
related_gregorian: coptic_year.related_gregorian,
231+
related_iso: coptic_year.related_iso,
232232
extended_year,
233233
ambiguity: types::YearAmbiguity::CenturyRequired,
234234
}
@@ -400,15 +400,15 @@ mod test {
400400
.unwrap()
401401
.to_calendar(Ethiopian::new())
402402
.era_year()
403-
.related_gregorian,
403+
.related_iso,
404404
2024
405405
);
406406
assert_eq!(
407407
Date::try_new_gregorian(2025, 9, 18)
408408
.unwrap()
409409
.to_calendar(Ethiopian::new())
410410
.era_year()
411-
.related_gregorian,
411+
.related_iso,
412412
2025
413413
);
414414

@@ -418,14 +418,14 @@ mod test {
418418
Date::try_new_ethiopian(EthiopianEraStyle::AmeteMihret, 16695, 1, 1)
419419
.unwrap()
420420
.era_year()
421-
.related_gregorian,
421+
.related_iso,
422422
16702
423423
);
424424
assert_eq!(
425425
Date::try_new_ethiopian(EthiopianEraStyle::AmeteMihret, 16696, 1, 1)
426426
.unwrap()
427427
.era_year()
428-
.related_gregorian,
428+
.related_iso,
429429
16704
430430
);
431431
}

‎components/calendar/src/cal/gregorian.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl GregorianYears for CeBce {
4242
era: tinystr!(16, "ce"),
4343
era_index: Some(1),
4444
year: extended_year,
45-
related_gregorian,
45+
related_iso: related_gregorian,
4646
extended_year,
4747
ambiguity: match extended_year {
4848
..=999 => types::YearAmbiguity::EraAndCenturyRequired,
@@ -56,7 +56,7 @@ impl GregorianYears for CeBce {
5656
era: tinystr!(16, "bce"),
5757
era_index: Some(0),
5858
year: 1 - extended_year,
59-
related_gregorian,
59+
related_iso: related_gregorian,
6060
extended_year,
6161
ambiguity: types::YearAmbiguity::EraAndCenturyRequired,
6262
}

‎components/calendar/src/cal/hebrew.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ impl Calendar for Hebrew {
323323
era_index: Some(0),
324324
era: tinystr!(16, "am"),
325325
year: extended_year,
326-
related_gregorian,
326+
related_iso: related_gregorian,
327327
extended_year,
328328
ambiguity: types::YearAmbiguity::CenturyRequired,
329329
}
@@ -536,15 +536,15 @@ mod tests {
536536
.unwrap()
537537
.to_calendar(Hebrew)
538538
.era_year()
539-
.related_gregorian,
539+
.related_iso,
540540
2024
541541
);
542542
assert_eq!(
543543
Date::try_new_gregorian(2025, 10, 18)
544544
.unwrap()
545545
.to_calendar(Hebrew)
546546
.era_year()
547-
.related_gregorian,
547+
.related_iso,
548548
2025
549549
);
550550

@@ -554,14 +554,14 @@ mod tests {
554554
Date::try_new_from_codes(None, 25962, TISHREI.code(), 1, Hebrew)
555555
.unwrap()
556556
.era_year()
557-
.related_gregorian,
557+
.related_iso,
558558
22201
559559
);
560560
assert_eq!(
561561
Date::try_new_from_codes(None, 25963, TISHREI.code(), 1, Hebrew)
562562
.unwrap()
563563
.era_year()
564-
.related_gregorian,
564+
.related_iso,
565565
22203
566566
);
567567
}

‎components/calendar/src/cal/hijri.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ impl<R: Rules> Calendar for Hijri<R> {
922922
era: tinystr!(16, "ah"),
923923
era_index: Some(0),
924924
year: extended_year,
925-
related_gregorian,
925+
related_iso: related_gregorian,
926926
extended_year,
927927
ambiguity: types::YearAmbiguity::CenturyRequired,
928928
}
@@ -932,7 +932,7 @@ impl<R: Rules> Calendar for Hijri<R> {
932932
era_index: Some(1),
933933
year: 1 - extended_year,
934934
extended_year,
935-
related_gregorian,
935+
related_iso: related_gregorian,
936936
ambiguity: types::YearAmbiguity::CenturyRequired,
937937
}
938938
}
@@ -1967,15 +1967,15 @@ mod test {
19671967
.unwrap()
19681968
.to_calendar(Hijri::new_umm_al_qura())
19691969
.era_year()
1970-
.related_gregorian,
1970+
.related_iso,
19711971
2024
19721972
);
19731973
assert_eq!(
19741974
Date::try_new_gregorian(2025, 7, 18)
19751975
.unwrap()
19761976
.to_calendar(Hijri::new_umm_al_qura())
19771977
.era_year()
1978-
.related_gregorian,
1978+
.related_iso,
19791979
2025
19801980
);
19811981
}

‎components/calendar/src/cal/indian.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ impl Calendar for Indian {
244244
era: tinystr!(16, "shaka"),
245245
year: extended_year,
246246
extended_year,
247-
related_gregorian: extended_year + YEAR_OFFSET,
247+
related_iso: extended_year + YEAR_OFFSET,
248248
ambiguity: types::YearAmbiguity::CenturyRequired,
249249
}
250250
}
@@ -553,15 +553,15 @@ mod tests {
553553
.unwrap()
554554
.to_calendar(Indian)
555555
.era_year()
556-
.related_gregorian,
556+
.related_iso,
557557
2024
558558
);
559559
assert_eq!(
560560
Date::try_new_gregorian(2025, 4, 18)
561561
.unwrap()
562562
.to_calendar(Indian)
563563
.era_year()
564-
.related_gregorian,
564+
.related_iso,
565565
2025
566566
);
567567
}

‎components/calendar/src/cal/iso.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl GregorianYears for IsoEra {
5252
era_index: Some(0),
5353
era: tinystr!(16, "default"),
5454
year: extended_year,
55-
related_gregorian,
55+
related_iso: related_gregorian,
5656
extended_year,
5757
ambiguity: types::YearAmbiguity::Unambiguous,
5858
}

‎components/calendar/src/cal/japanese.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ impl GregorianYears for &'_ Japanese {
256256
era,
257257
era_index: None,
258258
year: year - start.year + 1,
259-
related_gregorian,
259+
related_iso: related_gregorian,
260260
extended_year: year,
261261
ambiguity: types::YearAmbiguity::CenturyRequired,
262262
}
@@ -379,7 +379,7 @@ impl GregorianYears for &'_ JapaneseExtended {
379379
era,
380380
era_index: None,
381381
year: year - start.year + 1,
382-
related_gregorian,
382+
related_iso: related_gregorian,
383383
extended_year: year,
384384
ambiguity: types::YearAmbiguity::CenturyRequired,
385385
}

‎components/calendar/src/cal/julian.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ impl Calendar for Julian {
220220
era: tinystr!(16, "ce"),
221221
era_index: Some(1),
222222
year: extended_year,
223-
related_gregorian,
223+
related_iso: related_gregorian,
224224
extended_year,
225225
ambiguity: types::YearAmbiguity::CenturyRequired,
226226
}
@@ -229,7 +229,7 @@ impl Calendar for Julian {
229229
era: tinystr!(16, "bce"),
230230
era_index: Some(0),
231231
year: 1 - extended_year,
232-
related_gregorian,
232+
related_iso: related_gregorian,
233233
extended_year,
234234
ambiguity: types::YearAmbiguity::EraAndCenturyRequired,
235235
}
@@ -515,14 +515,14 @@ mod test {
515515
Date::try_new_julian(48900, 1, 1)
516516
.unwrap()
517517
.era_year()
518-
.related_gregorian,
518+
.related_iso,
519519
48900
520520
);
521521
assert_eq!(
522522
Date::try_new_julian(48901, 1, 1)
523523
.unwrap()
524524
.era_year()
525-
.related_gregorian,
525+
.related_iso,
526526
48902
527527
);
528528
}

0 commit comments

Comments
 (0)