@@ -133,8 +133,8 @@ pub enum AnyDateInner {
133
133
/// A date for a [`HijriTabular`] calendar
134
134
HijriTabular (
135
135
<HijriTabular as Calendar >:: DateInner ,
136
- HijriTabularEpoch ,
137
136
HijriTabularLeapYears ,
137
+ HijriTabularEpoch ,
138
138
) ,
139
139
/// A date for a [`HijriSimulated`] calendar
140
140
HijriSimulated ( <HijriSimulated as Calendar >:: DateInner ) ,
@@ -165,7 +165,7 @@ macro_rules! match_cal_and_date {
165
165
( & Self :: Indian ( ref $cal_matched) , & AnyDateInner :: Indian ( ref $date_matched) ) => $e,
166
166
(
167
167
& Self :: HijriTabular ( ref $cal_matched) ,
168
- & AnyDateInner :: HijriTabular ( ref $date_matched, epoch , leap_years ) ,
168
+ & AnyDateInner :: HijriTabular ( ref $date_matched, leap_years , epoch ) ,
169
169
) if $cal_matched. epoch == epoch && $cal_matched. leap_years == leap_years => $e,
170
170
(
171
171
& Self :: HijriSimulated ( ref $cal_matched) ,
@@ -205,7 +205,7 @@ macro_rules! match_cal {
205
205
& Self :: Indian ( ref $cal_matched) => AnyDateInner :: Indian ( $e) ,
206
206
& Self :: HijriSimulated ( ref $cal_matched) => AnyDateInner :: HijriSimulated ( $e) ,
207
207
& Self :: HijriTabular ( ref $cal_matched) => {
208
- AnyDateInner :: HijriTabular ( $e, $cal_matched. epoch , $cal_matched. leap_years )
208
+ AnyDateInner :: HijriTabular ( $e, $cal_matched. leap_years , $cal_matched. epoch )
209
209
}
210
210
& Self :: HijriUmmAlQura ( ref $cal_matched) => AnyDateInner :: HijriUmmAlQura ( $e) ,
211
211
& Self :: Iso ( ref $cal_matched) => AnyDateInner :: Iso ( $e) ,
@@ -285,7 +285,7 @@ impl Calendar for AnyCalendar {
285
285
}
286
286
(
287
287
Self :: HijriTabular ( c) ,
288
- & mut AnyDateInner :: HijriTabular ( ref mut d, epoch , leap_years ) ,
288
+ & mut AnyDateInner :: HijriTabular ( ref mut d, leap_years , epoch ) ,
289
289
) if c. epoch == epoch && c. leap_years == leap_years => {
290
290
c. offset_date ( d, offset. cast_unit ( ) )
291
291
}
@@ -392,8 +392,8 @@ impl Calendar for AnyCalendar {
392
392
(
393
393
Self :: HijriTabular ( c1) ,
394
394
Self :: HijriTabular ( c2) ,
395
- & AnyDateInner :: HijriTabular ( ref d1, e1 , l1 ) ,
396
- & AnyDateInner :: HijriTabular ( ref d2, e2 , l2 ) ,
395
+ & AnyDateInner :: HijriTabular ( ref d1, l1 , e1 ) ,
396
+ & AnyDateInner :: HijriTabular ( ref d2, l2 , e2 ) ,
397
397
) if c1. epoch == c2. epoch
398
398
&& c2. epoch == e1
399
399
&& e1 == e2
@@ -499,11 +499,11 @@ impl Calendar for AnyCalendar {
499
499
AnyCalendarKind :: Gregorian => "AnyCalendar (Gregorian)" ,
500
500
AnyCalendarKind :: Hebrew => "AnyCalendar (Hebrew)" ,
501
501
AnyCalendarKind :: Indian => "AnyCalendar (Indian)" ,
502
- AnyCalendarKind :: HijriTabularFridayEpochTypeII => {
503
- "AnyCalendar (Hijri, tabular, Friday epoch, type II leap years)"
502
+ AnyCalendarKind :: HijriTabularTypeIIFriday => {
503
+ "AnyCalendar (Hijri, tabular, type II leap years, Friday epoch )"
504
504
}
505
- AnyCalendarKind :: HijriTabularThursdayEpochTypeII => {
506
- "AnyCalendar (Hijri, tabular, Thursday epoch, type II leap years)"
505
+ AnyCalendarKind :: HijriTabularTypeIIThursday => {
506
+ "AnyCalendar (Hijri, tabular, type II leap years, Thursday epoch )"
507
507
}
508
508
AnyCalendarKind :: HijriSimulatedMecca => "AnyCalendar (Hijri, simulated Mecca)" ,
509
509
AnyCalendarKind :: HijriUmmAlQura => "AnyCalendar (Hijri, Umm al-Qura)" ,
@@ -542,19 +542,19 @@ impl AnyCalendar {
542
542
AnyCalendarKind :: Gregorian => AnyCalendar :: Gregorian ( Gregorian ) ,
543
543
AnyCalendarKind :: Hebrew => AnyCalendar :: Hebrew ( Hebrew ) ,
544
544
AnyCalendarKind :: Indian => AnyCalendar :: Indian ( Indian ) ,
545
- AnyCalendarKind :: HijriTabularFridayEpochTypeII => {
545
+ AnyCalendarKind :: HijriTabularTypeIIFriday => {
546
546
AnyCalendar :: HijriTabular ( HijriTabular :: new (
547
- HijriTabularEpoch :: Friday ,
548
547
crate :: cal:: hijri:: HijriTabularLeapYears :: TypeII ,
548
+ HijriTabularEpoch :: Friday ,
549
549
) )
550
550
}
551
551
AnyCalendarKind :: HijriSimulatedMecca => {
552
552
AnyCalendar :: HijriSimulated ( HijriSimulated :: new_mecca ( ) )
553
553
}
554
- AnyCalendarKind :: HijriTabularThursdayEpochTypeII => {
554
+ AnyCalendarKind :: HijriTabularTypeIIThursday => {
555
555
AnyCalendar :: HijriTabular ( HijriTabular :: new (
556
- HijriTabularEpoch :: Thursday ,
557
556
crate :: cal:: hijri:: HijriTabularLeapYears :: TypeII ,
557
+ HijriTabularEpoch :: Thursday ,
558
558
) )
559
559
}
560
560
AnyCalendarKind :: HijriUmmAlQura => AnyCalendar :: HijriUmmAlQura ( HijriUmmAlQura :: new ( ) ) ,
@@ -595,19 +595,19 @@ impl AnyCalendar {
595
595
AnyCalendarKind :: Gregorian => AnyCalendar :: Gregorian ( Gregorian ) ,
596
596
AnyCalendarKind :: Hebrew => AnyCalendar :: Hebrew ( Hebrew ) ,
597
597
AnyCalendarKind :: Indian => AnyCalendar :: Indian ( Indian ) ,
598
- AnyCalendarKind :: HijriTabularFridayEpochTypeII => {
598
+ AnyCalendarKind :: HijriTabularTypeIIFriday => {
599
599
AnyCalendar :: HijriTabular ( HijriTabular :: new (
600
- HijriTabularEpoch :: Friday ,
601
600
crate :: cal:: hijri:: HijriTabularLeapYears :: TypeII ,
601
+ HijriTabularEpoch :: Friday ,
602
602
) )
603
603
}
604
604
AnyCalendarKind :: HijriSimulatedMecca => AnyCalendar :: HijriSimulated (
605
605
HijriSimulated :: try_new_mecca_with_buffer_provider ( provider) ?,
606
606
) ,
607
- AnyCalendarKind :: HijriTabularThursdayEpochTypeII => {
607
+ AnyCalendarKind :: HijriTabularTypeIIThursday => {
608
608
AnyCalendar :: HijriTabular ( HijriTabular :: new (
609
- HijriTabularEpoch :: Thursday ,
610
609
crate :: cal:: hijri:: HijriTabularLeapYears :: TypeII ,
610
+ HijriTabularEpoch :: Thursday ,
611
611
) )
612
612
}
613
613
AnyCalendarKind :: HijriUmmAlQura => {
@@ -650,19 +650,19 @@ impl AnyCalendar {
650
650
AnyCalendarKind :: Gregorian => AnyCalendar :: Gregorian ( Gregorian ) ,
651
651
AnyCalendarKind :: Hebrew => AnyCalendar :: Hebrew ( Hebrew ) ,
652
652
AnyCalendarKind :: Indian => AnyCalendar :: Indian ( Indian ) ,
653
- AnyCalendarKind :: HijriTabularFridayEpochTypeII => {
653
+ AnyCalendarKind :: HijriTabularTypeIIFriday => {
654
654
AnyCalendar :: HijriTabular ( HijriTabular :: new (
655
- HijriTabularEpoch :: Friday ,
656
655
crate :: cal:: hijri:: HijriTabularLeapYears :: TypeII ,
656
+ HijriTabularEpoch :: Friday ,
657
657
) )
658
658
}
659
659
AnyCalendarKind :: HijriSimulatedMecca => {
660
660
AnyCalendar :: HijriSimulated ( HijriSimulated :: try_new_mecca_unstable ( provider) ?)
661
661
}
662
- AnyCalendarKind :: HijriTabularThursdayEpochTypeII => {
662
+ AnyCalendarKind :: HijriTabularTypeIIThursday => {
663
663
AnyCalendar :: HijriTabular ( HijriTabular :: new (
664
- HijriTabularEpoch :: Thursday ,
665
664
crate :: cal:: hijri:: HijriTabularLeapYears :: TypeII ,
665
+ HijriTabularEpoch :: Thursday ,
666
666
) )
667
667
}
668
668
AnyCalendarKind :: HijriUmmAlQura => {
@@ -730,15 +730,15 @@ impl AnyDateInner {
730
730
AnyDateInner :: Indian ( _) => AnyCalendarKind :: Indian ,
731
731
AnyDateInner :: HijriTabular (
732
732
_,
733
- HijriTabularEpoch :: Friday ,
734
733
HijriTabularLeapYears :: TypeII ,
735
- ) => AnyCalendarKind :: HijriTabularFridayEpochTypeII ,
734
+ HijriTabularEpoch :: Friday ,
735
+ ) => AnyCalendarKind :: HijriTabularTypeIIFriday ,
736
736
AnyDateInner :: HijriSimulated ( _) => AnyCalendarKind :: HijriSimulatedMecca ,
737
737
AnyDateInner :: HijriTabular (
738
738
_,
739
- HijriTabularEpoch :: Thursday ,
740
739
HijriTabularLeapYears :: TypeII ,
741
- ) => AnyCalendarKind :: HijriTabularThursdayEpochTypeII ,
740
+ HijriTabularEpoch :: Thursday ,
741
+ ) => AnyCalendarKind :: HijriTabularTypeIIThursday ,
742
742
AnyDateInner :: HijriUmmAlQura ( _) => AnyCalendarKind :: HijriUmmAlQura ,
743
743
AnyDateInner :: Iso ( _) => AnyCalendarKind :: Iso ,
744
744
AnyDateInner :: Japanese ( _) => AnyCalendarKind :: Japanese ,
@@ -771,12 +771,12 @@ pub enum AnyCalendarKind {
771
771
Hebrew ,
772
772
/// The kind of a [`Indian`] calendar
773
773
Indian ,
774
- /// The kind of an [`HijriTabular`] calendar using [`HijriTabularEpoch::Friday `] and [`HijriTabularLeapYears::TypeII `]
775
- HijriTabularFridayEpochTypeII ,
774
+ /// The kind of an [`HijriTabular`] calendar using [`HijriTabularLeapYears::TypeII `] and [`HijriTabularEpoch::Friday `]
775
+ HijriTabularTypeIIFriday ,
776
776
/// The kind of an [`HijriSimulated`], Mecca calendar
777
777
HijriSimulatedMecca ,
778
- /// The kind of an [`HijriTabular`] calendar using [`HijriTabularEpoch::Thursday `] and [`HijriTabularLeapYears::TypeII `]
779
- HijriTabularThursdayEpochTypeII ,
778
+ /// The kind of an [`HijriTabular`] calendar using [`HijriTabularLeapYears::TypeII `] and [`HijriTabularEpoch::Thursday `]
779
+ HijriTabularTypeIIThursday ,
780
780
/// The kind of an [`HijriUmmAlQura`] calendar
781
781
HijriUmmAlQura ,
782
782
/// The kind of an [`Iso`] calendar
@@ -821,15 +821,15 @@ impl AnyCalendarKind {
821
821
AnyCalendarKind :: Gregorian => Gregorian . debug_name ( ) ,
822
822
AnyCalendarKind :: Hebrew => Hebrew . debug_name ( ) ,
823
823
AnyCalendarKind :: Indian => Indian . debug_name ( ) ,
824
- AnyCalendarKind :: HijriTabularFridayEpochTypeII => HijriTabular :: new (
825
- HijriTabularEpoch :: Friday ,
824
+ AnyCalendarKind :: HijriTabularTypeIIFriday => HijriTabular :: new (
826
825
crate :: cal:: hijri:: HijriTabularLeapYears :: TypeII ,
826
+ HijriTabularEpoch :: Friday ,
827
827
)
828
828
. debug_name ( ) ,
829
829
AnyCalendarKind :: HijriSimulatedMecca => HijriSimulated :: DEBUG_NAME ,
830
- AnyCalendarKind :: HijriTabularThursdayEpochTypeII => HijriTabular :: new (
831
- HijriTabularEpoch :: Thursday ,
830
+ AnyCalendarKind :: HijriTabularTypeIIThursday => HijriTabular :: new (
832
831
crate :: cal:: hijri:: HijriTabularLeapYears :: TypeII ,
832
+ HijriTabularEpoch :: Thursday ,
833
833
)
834
834
. debug_name ( ) ,
835
835
AnyCalendarKind :: HijriUmmAlQura => HijriUmmAlQura :: DEBUG_NAME ,
@@ -859,10 +859,10 @@ impl TryFrom<CalendarAlgorithm> for AnyCalendarKind {
859
859
Hijri ( None ) => Err ( ( ) ) ,
860
860
Hijri ( Some ( HijriCalendarAlgorithm :: Umalqura ) ) => Ok ( AnyCalendarKind :: HijriUmmAlQura ) ,
861
861
Hijri ( Some ( HijriCalendarAlgorithm :: Tbla ) ) => {
862
- Ok ( AnyCalendarKind :: HijriTabularThursdayEpochTypeII )
862
+ Ok ( AnyCalendarKind :: HijriTabularTypeIIThursday )
863
863
}
864
864
Hijri ( Some ( HijriCalendarAlgorithm :: Civil ) ) => {
865
- Ok ( AnyCalendarKind :: HijriTabularFridayEpochTypeII )
865
+ Ok ( AnyCalendarKind :: HijriTabularTypeIIFriday )
866
866
}
867
867
Hijri ( Some ( HijriCalendarAlgorithm :: Rgsa ) ) => Ok ( AnyCalendarKind :: HijriSimulatedMecca ) ,
868
868
Iso8601 => Ok ( AnyCalendarKind :: Iso ) ,
@@ -1241,12 +1241,12 @@ impl IntoAnyCalendar for HijriTabular {
1241
1241
}
1242
1242
#[ inline]
1243
1243
fn kind ( & self ) -> AnyCalendarKind {
1244
- match ( self . epoch , self . leap_years ) {
1245
- ( HijriTabularEpoch :: Friday , HijriTabularLeapYears :: TypeII ) => {
1246
- AnyCalendarKind :: HijriTabularFridayEpochTypeII
1244
+ match ( self . leap_years , self . epoch ) {
1245
+ ( HijriTabularLeapYears :: TypeII , HijriTabularEpoch :: Friday ) => {
1246
+ AnyCalendarKind :: HijriTabularTypeIIFriday
1247
1247
}
1248
- ( HijriTabularEpoch :: Thursday , HijriTabularLeapYears :: TypeII ) => {
1249
- AnyCalendarKind :: HijriTabularThursdayEpochTypeII
1248
+ ( HijriTabularLeapYears :: TypeII , HijriTabularEpoch :: Thursday ) => {
1249
+ AnyCalendarKind :: HijriTabularTypeIIThursday
1250
1250
}
1251
1251
}
1252
1252
}
@@ -1268,7 +1268,7 @@ impl IntoAnyCalendar for HijriTabular {
1268
1268
}
1269
1269
#[ inline]
1270
1270
fn date_to_any ( & self , d : & Self :: DateInner ) -> AnyDateInner {
1271
- AnyDateInner :: HijriTabular ( * d, self . epoch , self . leap_years )
1271
+ AnyDateInner :: HijriTabular ( * d, self . leap_years , self . epoch )
1272
1272
}
1273
1273
}
1274
1274
@@ -1614,11 +1614,10 @@ mod tests {
1614
1614
let gregorian = AnyCalendar :: new ( AnyCalendarKind :: Gregorian ) ;
1615
1615
let hebrew = AnyCalendar :: new ( AnyCalendarKind :: Hebrew ) ;
1616
1616
let indian = AnyCalendar :: new ( AnyCalendarKind :: Indian ) ;
1617
- let hijri_civil: AnyCalendar =
1618
- AnyCalendar :: new ( AnyCalendarKind :: HijriTabularFridayEpochTypeII ) ;
1617
+ let hijri_civil: AnyCalendar = AnyCalendar :: new ( AnyCalendarKind :: HijriTabularTypeIIFriday ) ;
1619
1618
let hijri_simulated: AnyCalendar = AnyCalendar :: new ( AnyCalendarKind :: HijriSimulatedMecca ) ;
1620
1619
let hijri_astronomical: AnyCalendar =
1621
- AnyCalendar :: new ( AnyCalendarKind :: HijriTabularThursdayEpochTypeII ) ;
1620
+ AnyCalendar :: new ( AnyCalendarKind :: HijriTabularTypeIIThursday ) ;
1622
1621
let hijri_umm_al_qura: AnyCalendar = AnyCalendar :: new ( AnyCalendarKind :: HijriUmmAlQura ) ;
1623
1622
let japanese = AnyCalendar :: new ( AnyCalendarKind :: Japanese ) ;
1624
1623
let japanext = AnyCalendar :: new ( AnyCalendarKind :: JapaneseExtended ) ;
0 commit comments