@@ -312,6 +312,7 @@ fn ymdhms_nano(
312
312
}
313
313
314
314
// local helper function to easily create a DateTime<Utc>
315
+ #[ cfg( any( feature = "alloc" , feature = "std" ) ) ]
315
316
fn ymdhms_utc ( year : i32 , month : u32 , day : u32 , hour : u32 , min : u32 , sec : u32 ) -> DateTime < Utc > {
316
317
Utc . with_ymd_and_hms ( year, month, day, hour, min, sec) . unwrap ( )
317
318
}
@@ -958,39 +959,37 @@ fn test_utc_datetime_from_str() {
958
959
}
959
960
960
961
#[ test]
961
- fn test_utc_datetime_from_str_with_spaces ( ) {
962
- let dt = ymdhms_utc ( 2013 , 8 , 9 , 23 , 54 , 35 ) ;
962
+ fn test_datetime_parse_from_str_with_spaces ( ) {
963
+ let parse_from_str = NaiveDateTime :: parse_from_str;
964
+ let dt = NaiveDate :: from_ymd_opt ( 2013 , 8 , 9 ) . unwrap ( ) . and_hms_opt ( 23 , 54 , 35 ) . unwrap ( ) ;
963
965
// with varying spaces - should succeed
964
- assert_eq ! ( Utc . datetime_from_str( " Aug 09 2013 23:54:35" , " %b %d %Y %H:%M:%S" ) , Ok ( dt) , ) ;
965
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013 23:54:35 " , "%b %d %Y %H:%M:%S " ) , Ok ( dt) , ) ;
966
- assert_eq ! ( Utc . datetime_from_str( " Aug 09 2013 23:54:35 " , " %b %d %Y %H:%M:%S " ) , Ok ( dt) , ) ;
967
- assert_eq ! ( Utc . datetime_from_str( " Aug 09 2013 23:54:35" , " %b %d %Y %H:%M:%S" ) , Ok ( dt) , ) ;
968
- assert_eq ! ( Utc . datetime_from_str( " Aug 09 2013 23:54:35" , " %b %d %Y %H:%M:%S" ) , Ok ( dt) , ) ;
969
- assert_eq ! (
970
- Utc . datetime_from_str( "\n \t Aug 09 2013 23:54:35 " , "\n \t %b %d %Y %H:%M:%S " ) ,
971
- Ok ( dt) ,
972
- ) ;
973
- assert_eq ! ( Utc . datetime_from_str( "\t Aug 09 2013 23:54:35\t " , "\t %b %d %Y %H:%M:%S\t " ) , Ok ( dt) , ) ;
974
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S" ) , Ok ( dt) , ) ;
975
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S" ) , Ok ( dt) , ) ;
976
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013\t 23:54:35" , "%b %d %Y\t %H:%M:%S" ) , Ok ( dt) , ) ;
977
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013\t \t 23:54:35" , "%b %d %Y\t \t %H:%M:%S" ) , Ok ( dt) , ) ;
978
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013 23:54:35 " , "%b %d %Y %H:%M:%S\n " ) , Ok ( dt) , ) ;
979
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y\t %H:%M:%S" ) , Ok ( dt) , ) ;
980
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S " ) , Ok ( dt) , ) ;
981
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013 23:54:35" , " %b %d %Y %H:%M:%S" ) , Ok ( dt) , ) ;
982
- assert_eq ! ( Utc . datetime_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S\n " ) , Ok ( dt) , ) ;
966
+ assert_eq ! ( parse_from_str( " Aug 09 2013 23:54:35" , " %b %d %Y %H:%M:%S" ) , Ok ( dt) ) ;
967
+ assert_eq ! ( parse_from_str( "Aug 09 2013 23:54:35 " , "%b %d %Y %H:%M:%S " ) , Ok ( dt) ) ;
968
+ assert_eq ! ( parse_from_str( " Aug 09 2013 23:54:35 " , " %b %d %Y %H:%M:%S " ) , Ok ( dt) ) ;
969
+ assert_eq ! ( parse_from_str( " Aug 09 2013 23:54:35" , " %b %d %Y %H:%M:%S" ) , Ok ( dt) ) ;
970
+ assert_eq ! ( parse_from_str( " Aug 09 2013 23:54:35" , " %b %d %Y %H:%M:%S" ) , Ok ( dt) ) ;
971
+ assert_eq ! ( parse_from_str( "\n \t Aug 09 2013 23:54:35 " , "\n \t %b %d %Y %H:%M:%S " ) , Ok ( dt) ) ;
972
+ assert_eq ! ( parse_from_str( "\t Aug 09 2013 23:54:35\t " , "\t %b %d %Y %H:%M:%S\t " ) , Ok ( dt) ) ;
973
+ assert_eq ! ( parse_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S" ) , Ok ( dt) ) ;
974
+ assert_eq ! ( parse_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S" ) , Ok ( dt) ) ;
975
+ assert_eq ! ( parse_from_str( "Aug 09 2013\t 23:54:35" , "%b %d %Y\t %H:%M:%S" ) , Ok ( dt) ) ;
976
+ assert_eq ! ( parse_from_str( "Aug 09 2013\t \t 23:54:35" , "%b %d %Y\t \t %H:%M:%S" ) , Ok ( dt) ) ;
977
+ assert_eq ! ( parse_from_str( "Aug 09 2013 23:54:35 " , "%b %d %Y %H:%M:%S\n " ) , Ok ( dt) ) ;
978
+ assert_eq ! ( parse_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y\t %H:%M:%S" ) , Ok ( dt) ) ;
979
+ assert_eq ! ( parse_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S " ) , Ok ( dt) ) ;
980
+ assert_eq ! ( parse_from_str( "Aug 09 2013 23:54:35" , " %b %d %Y %H:%M:%S" ) , Ok ( dt) ) ;
981
+ assert_eq ! ( parse_from_str( "Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S\n " ) , Ok ( dt) ) ;
983
982
// with varying spaces - should fail
984
983
// leading space in data
985
- assert ! ( Utc . datetime_from_str ( " Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S" ) . is_err( ) ) ;
984
+ assert ! ( parse_from_str ( " Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S" ) . is_err( ) ) ;
986
985
// trailing space in data
987
- assert ! ( Utc . datetime_from_str ( "Aug 09 2013 23:54:35 " , "%b %d %Y %H:%M:%S" ) . is_err( ) ) ;
986
+ assert ! ( parse_from_str ( "Aug 09 2013 23:54:35 " , "%b %d %Y %H:%M:%S" ) . is_err( ) ) ;
988
987
// trailing tab in data
989
- assert ! ( Utc . datetime_from_str ( "Aug 09 2013 23:54:35\t " , "%b %d %Y %H:%M:%S" ) . is_err( ) ) ;
988
+ assert ! ( parse_from_str ( "Aug 09 2013 23:54:35\t " , "%b %d %Y %H:%M:%S" ) . is_err( ) ) ;
990
989
// mismatched newlines
991
- assert ! ( Utc . datetime_from_str ( "\n Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S\n " ) . is_err( ) ) ;
990
+ assert ! ( parse_from_str ( "\n Aug 09 2013 23:54:35" , "%b %d %Y %H:%M:%S\n " ) . is_err( ) ) ;
992
991
// trailing literal in data
993
- assert ! ( Utc . datetime_from_str ( "Aug 09 2013 23:54:35 !!!" , "%b %d %Y %H:%M:%S " ) . is_err( ) ) ;
992
+ assert ! ( parse_from_str ( "Aug 09 2013 23:54:35 !!!" , "%b %d %Y %H:%M:%S " ) . is_err( ) ) ;
994
993
}
995
994
996
995
#[ test]
0 commit comments