@@ -734,6 +734,9 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
734734 self . hash_name ( i. ident . name ) ;
735735 }
736736 } ,
737+ ExprKind :: Array ( v) => {
738+ self . hash_exprs ( v) ;
739+ } ,
737740 ExprKind :: Assign ( l, r, _) => {
738741 self . hash_expr ( l) ;
739742 self . hash_expr ( r) ;
@@ -743,6 +746,9 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
743746 self . hash_expr ( l) ;
744747 self . hash_expr ( r) ;
745748 } ,
749+ ExprKind :: Become ( f) => {
750+ self . hash_expr ( f) ;
751+ } ,
746752 ExprKind :: Block ( b, _) => {
747753 self . hash_block ( b) ;
748754 } ,
@@ -759,9 +765,6 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
759765 self . hash_expr ( j) ;
760766 }
761767 } ,
762- ExprKind :: DropTemps ( e) | ExprKind :: Yield ( e, _) => {
763- self . hash_expr ( e) ;
764- } ,
765768 ExprKind :: Call ( fun, args) => {
766769 self . hash_expr ( fun) ;
767770 self . hash_exprs ( args) ;
@@ -777,6 +780,12 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
777780 // closures inherit TypeckResults
778781 self . hash_expr ( self . cx . tcx . hir ( ) . body ( body) . value ) ;
779782 } ,
783+ ExprKind :: ConstBlock ( ref l_id) => {
784+ self . hash_body ( l_id. body ) ;
785+ } ,
786+ ExprKind :: DropTemps ( e) | ExprKind :: Yield ( e, _) => {
787+ self . hash_expr ( e) ;
788+ } ,
780789 ExprKind :: Field ( e, ref f) => {
781790 self . hash_expr ( e) ;
782791 self . hash_name ( f. name ) ;
@@ -838,20 +847,13 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
838847 }
839848 }
840849 } ,
841- ExprKind :: OffsetOf ( container, fields) => {
842- self . hash_ty ( container) ;
843- for field in fields {
844- self . hash_name ( field. name ) ;
845- }
846- } ,
847850 ExprKind :: Let ( Let { pat, init, ty, .. } ) => {
848851 self . hash_expr ( init) ;
849852 if let Some ( ty) = ty {
850853 self . hash_ty ( ty) ;
851854 }
852855 self . hash_pat ( pat) ;
853856 } ,
854- ExprKind :: Err ( _) => { } ,
855857 ExprKind :: Lit ( l) => {
856858 l. node . hash ( & mut self . s ) ;
857859 } ,
@@ -886,8 +888,14 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
886888 self . hash_expr ( receiver) ;
887889 self . hash_exprs ( args) ;
888890 } ,
889- ExprKind :: ConstBlock ( ref l_id) => {
890- self . hash_body ( l_id. body ) ;
891+ ExprKind :: OffsetOf ( container, fields) => {
892+ self . hash_ty ( container) ;
893+ for field in fields {
894+ self . hash_name ( field. name ) ;
895+ }
896+ } ,
897+ ExprKind :: Path ( ref qpath) => {
898+ self . hash_qpath ( qpath) ;
891899 } ,
892900 ExprKind :: Repeat ( e, len) => {
893901 self . hash_expr ( e) ;
@@ -898,12 +906,6 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
898906 self . hash_expr ( e) ;
899907 }
900908 } ,
901- ExprKind :: Become ( f) => {
902- self . hash_expr ( f) ;
903- } ,
904- ExprKind :: Path ( ref qpath) => {
905- self . hash_qpath ( qpath) ;
906- } ,
907909 ExprKind :: Struct ( path, fields, ref expr) => {
908910 self . hash_qpath ( path) ;
909911
@@ -919,13 +921,11 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
919921 ExprKind :: Tup ( tup) => {
920922 self . hash_exprs ( tup) ;
921923 } ,
922- ExprKind :: Array ( v) => {
923- self . hash_exprs ( v) ;
924- } ,
925924 ExprKind :: Unary ( lop, le) => {
926925 std:: mem:: discriminant ( & lop) . hash ( & mut self . s ) ;
927926 self . hash_expr ( le) ;
928927 } ,
928+ ExprKind :: Err ( _) => { } ,
929929 }
930930 }
931931
0 commit comments