@@ -198,31 +198,31 @@ fn test_date_from_yo() {
198
198
199
199
#[ test]
200
200
fn test_date_from_isoywd ( ) {
201
- let isoywd_opt = NaiveDate :: from_isoywd_opt;
201
+ let from_isoywd = NaiveDate :: from_isoywd_opt;
202
202
let ymd = |y, m, d| NaiveDate :: from_ymd_opt ( y, m, d) . unwrap ( ) ;
203
203
204
- assert_eq ! ( isoywd_opt ( 2004 , 0 , Weekday :: Sun ) , None ) ;
205
- assert_eq ! ( isoywd_opt ( 2004 , 1 , Weekday :: Mon ) , Some ( ymd( 2003 , 12 , 29 ) ) ) ;
206
- assert_eq ! ( isoywd_opt ( 2004 , 1 , Weekday :: Sun ) , Some ( ymd( 2004 , 1 , 4 ) ) ) ;
207
- assert_eq ! ( isoywd_opt ( 2004 , 2 , Weekday :: Mon ) , Some ( ymd( 2004 , 1 , 5 ) ) ) ;
208
- assert_eq ! ( isoywd_opt ( 2004 , 2 , Weekday :: Sun ) , Some ( ymd( 2004 , 1 , 11 ) ) ) ;
209
- assert_eq ! ( isoywd_opt ( 2004 , 52 , Weekday :: Mon ) , Some ( ymd( 2004 , 12 , 20 ) ) ) ;
210
- assert_eq ! ( isoywd_opt ( 2004 , 52 , Weekday :: Sun ) , Some ( ymd( 2004 , 12 , 26 ) ) ) ;
211
- assert_eq ! ( isoywd_opt ( 2004 , 53 , Weekday :: Mon ) , Some ( ymd( 2004 , 12 , 27 ) ) ) ;
212
- assert_eq ! ( isoywd_opt ( 2004 , 53 , Weekday :: Sun ) , Some ( ymd( 2005 , 1 , 2 ) ) ) ;
213
- assert_eq ! ( isoywd_opt ( 2004 , 54 , Weekday :: Mon ) , None ) ;
214
-
215
- assert_eq ! ( isoywd_opt ( 2011 , 0 , Weekday :: Sun ) , None ) ;
216
- assert_eq ! ( isoywd_opt ( 2011 , 1 , Weekday :: Mon ) , Some ( ymd( 2011 , 1 , 3 ) ) ) ;
217
- assert_eq ! ( isoywd_opt ( 2011 , 1 , Weekday :: Sun ) , Some ( ymd( 2011 , 1 , 9 ) ) ) ;
218
- assert_eq ! ( isoywd_opt ( 2011 , 2 , Weekday :: Mon ) , Some ( ymd( 2011 , 1 , 10 ) ) ) ;
219
- assert_eq ! ( isoywd_opt ( 2011 , 2 , Weekday :: Sun ) , Some ( ymd( 2011 , 1 , 16 ) ) ) ;
220
-
221
- assert_eq ! ( isoywd_opt ( 2018 , 51 , Weekday :: Mon ) , Some ( ymd( 2018 , 12 , 17 ) ) ) ;
222
- assert_eq ! ( isoywd_opt ( 2018 , 51 , Weekday :: Sun ) , Some ( ymd( 2018 , 12 , 23 ) ) ) ;
223
- assert_eq ! ( isoywd_opt ( 2018 , 52 , Weekday :: Mon ) , Some ( ymd( 2018 , 12 , 24 ) ) ) ;
224
- assert_eq ! ( isoywd_opt ( 2018 , 52 , Weekday :: Sun ) , Some ( ymd( 2018 , 12 , 30 ) ) ) ;
225
- assert_eq ! ( isoywd_opt ( 2018 , 53 , Weekday :: Mon ) , None ) ;
204
+ assert_eq ! ( from_isoywd ( 2004 , 0 , Weekday :: Sun ) , None ) ;
205
+ assert_eq ! ( from_isoywd ( 2004 , 1 , Weekday :: Mon ) , Some ( ymd( 2003 , 12 , 29 ) ) ) ;
206
+ assert_eq ! ( from_isoywd ( 2004 , 1 , Weekday :: Sun ) , Some ( ymd( 2004 , 1 , 4 ) ) ) ;
207
+ assert_eq ! ( from_isoywd ( 2004 , 2 , Weekday :: Mon ) , Some ( ymd( 2004 , 1 , 5 ) ) ) ;
208
+ assert_eq ! ( from_isoywd ( 2004 , 2 , Weekday :: Sun ) , Some ( ymd( 2004 , 1 , 11 ) ) ) ;
209
+ assert_eq ! ( from_isoywd ( 2004 , 52 , Weekday :: Mon ) , Some ( ymd( 2004 , 12 , 20 ) ) ) ;
210
+ assert_eq ! ( from_isoywd ( 2004 , 52 , Weekday :: Sun ) , Some ( ymd( 2004 , 12 , 26 ) ) ) ;
211
+ assert_eq ! ( from_isoywd ( 2004 , 53 , Weekday :: Mon ) , Some ( ymd( 2004 , 12 , 27 ) ) ) ;
212
+ assert_eq ! ( from_isoywd ( 2004 , 53 , Weekday :: Sun ) , Some ( ymd( 2005 , 1 , 2 ) ) ) ;
213
+ assert_eq ! ( from_isoywd ( 2004 , 54 , Weekday :: Mon ) , None ) ;
214
+
215
+ assert_eq ! ( from_isoywd ( 2011 , 0 , Weekday :: Sun ) , None ) ;
216
+ assert_eq ! ( from_isoywd ( 2011 , 1 , Weekday :: Mon ) , Some ( ymd( 2011 , 1 , 3 ) ) ) ;
217
+ assert_eq ! ( from_isoywd ( 2011 , 1 , Weekday :: Sun ) , Some ( ymd( 2011 , 1 , 9 ) ) ) ;
218
+ assert_eq ! ( from_isoywd ( 2011 , 2 , Weekday :: Mon ) , Some ( ymd( 2011 , 1 , 10 ) ) ) ;
219
+ assert_eq ! ( from_isoywd ( 2011 , 2 , Weekday :: Sun ) , Some ( ymd( 2011 , 1 , 16 ) ) ) ;
220
+
221
+ assert_eq ! ( from_isoywd ( 2018 , 51 , Weekday :: Mon ) , Some ( ymd( 2018 , 12 , 17 ) ) ) ;
222
+ assert_eq ! ( from_isoywd ( 2018 , 51 , Weekday :: Sun ) , Some ( ymd( 2018 , 12 , 23 ) ) ) ;
223
+ assert_eq ! ( from_isoywd ( 2018 , 52 , Weekday :: Mon ) , Some ( ymd( 2018 , 12 , 24 ) ) ) ;
224
+ assert_eq ! ( from_isoywd ( 2018 , 52 , Weekday :: Sun ) , Some ( ymd( 2018 , 12 , 30 ) ) ) ;
225
+ assert_eq ! ( from_isoywd ( 2018 , 53 , Weekday :: Mon ) , None ) ;
226
226
}
227
227
228
228
#[ test]
0 commit comments