@@ -431,35 +431,6 @@ impl<'a> StrftimeItems<'a> {
431431 use Item :: { Literal , Space } ;
432432 use Numeric :: * ;
433433
434- static D_FMT : & [ Item < ' static > ] =
435- & [ num0 ( Month ) , Literal ( "/" ) , num0 ( Day ) , Literal ( "/" ) , num0 ( YearMod100 ) ] ;
436- static D_T_FMT : & [ Item < ' static > ] = & [
437- fixed ( Fixed :: ShortWeekdayName ) ,
438- Space ( " " ) ,
439- fixed ( Fixed :: ShortMonthName ) ,
440- Space ( " " ) ,
441- nums ( Day ) ,
442- Space ( " " ) ,
443- num0 ( Hour ) ,
444- Literal ( ":" ) ,
445- num0 ( Minute ) ,
446- Literal ( ":" ) ,
447- num0 ( Second ) ,
448- Space ( " " ) ,
449- num0 ( Year ) ,
450- ] ;
451- static T_FMT : & [ Item < ' static > ] =
452- & [ num0 ( Hour ) , Literal ( ":" ) , num0 ( Minute ) , Literal ( ":" ) , num0 ( Second ) ] ;
453- static T_FMT_AMPM : & [ Item < ' static > ] = & [
454- num0 ( Hour12 ) ,
455- Literal ( ":" ) ,
456- num0 ( Minute ) ,
457- Literal ( ":" ) ,
458- num0 ( Second ) ,
459- Space ( " " ) ,
460- fixed ( Fixed :: UpperAmPm ) ,
461- ] ;
462-
463434 match remainder. chars ( ) . next ( ) {
464435 // we are done
465436 None => None ,
@@ -775,6 +746,45 @@ impl<'a> Iterator for StrftimeItems<'a> {
775746 }
776747}
777748
749+ static D_FMT : & [ Item < ' static > ] = & [
750+ num0 ( Numeric :: Month ) ,
751+ Item :: Literal ( "/" ) ,
752+ num0 ( Numeric :: Day ) ,
753+ Item :: Literal ( "/" ) ,
754+ num0 ( Numeric :: YearMod100 ) ,
755+ ] ;
756+ static D_T_FMT : & [ Item < ' static > ] = & [
757+ fixed ( Fixed :: ShortWeekdayName ) ,
758+ Item :: Space ( " " ) ,
759+ fixed ( Fixed :: ShortMonthName ) ,
760+ Item :: Space ( " " ) ,
761+ nums ( Numeric :: Day ) ,
762+ Item :: Space ( " " ) ,
763+ num0 ( Numeric :: Hour ) ,
764+ Item :: Literal ( ":" ) ,
765+ num0 ( Numeric :: Minute ) ,
766+ Item :: Literal ( ":" ) ,
767+ num0 ( Numeric :: Second ) ,
768+ Item :: Space ( " " ) ,
769+ num0 ( Numeric :: Year ) ,
770+ ] ;
771+ static T_FMT : & [ Item < ' static > ] = & [
772+ num0 ( Numeric :: Hour ) ,
773+ Item :: Literal ( ":" ) ,
774+ num0 ( Numeric :: Minute ) ,
775+ Item :: Literal ( ":" ) ,
776+ num0 ( Numeric :: Second ) ,
777+ ] ;
778+ static T_FMT_AMPM : & [ Item < ' static > ] = & [
779+ num0 ( Numeric :: Hour12 ) ,
780+ Item :: Literal ( ":" ) ,
781+ num0 ( Numeric :: Minute ) ,
782+ Item :: Literal ( ":" ) ,
783+ num0 ( Numeric :: Second ) ,
784+ Item :: Space ( " " ) ,
785+ fixed ( Fixed :: UpperAmPm ) ,
786+ ] ;
787+
778788const HAVE_ALTERNATES : & str = "z" ;
779789
780790#[ cfg( test) ]
0 commit comments