@@ -107,9 +107,9 @@ fn test_expr() {
107
107
c1 ! ( expr, [ true || false ] , "true || false" ) ;
108
108
c1 ! ( expr, [ true || false && false ] , "true || false && false" ) ;
109
109
c1 ! ( expr, [ a < 1 && 2 < b && c > 3 && 4 > d ] , "a < 1 && 2 < b && c > 3 && 4 > d" ) ;
110
- c2 ! ( expr, [ a & b & !c ] , "a & b & !c" , "a & b &!c" ) ; // FIXME
110
+ c1 ! ( expr, [ a & b & !c ] , "a & b & !c" ) ;
111
111
c1 ! ( expr, [ a + b * c - d + -1 * -2 - -3 ] , "a + b * c - d + -1 * -2 - -3" ) ;
112
- c2 ! ( expr, [ x = !y ] , "x = !y" , "x =!y" ) ; // FIXME
112
+ c1 ! ( expr, [ x = !y ] , "x = !y" ) ;
113
113
114
114
// ExprKind::Unary
115
115
c1 ! ( expr, [ * expr ] , "*expr" ) ;
@@ -141,15 +141,14 @@ fn test_expr() {
141
141
"if let _ = (true && false) {}" ,
142
142
"if let _ = true && false {}" ,
143
143
) ;
144
- c2 ! ( expr,
144
+ c1 ! ( expr,
145
145
[ match ( ) { _ if let _ = Struct { } => { } } ] ,
146
- "match () { _ if let _ = Struct {} => {} }" ,
147
- "match() { _ if let _ = Struct {} => {} }" ,
146
+ "match () { _ if let _ = Struct {} => {} }"
148
147
) ;
149
148
150
149
// ExprKind::If
151
150
c1 ! ( expr, [ if true { } ] , "if true {}" ) ;
152
- c2 ! ( expr, [ if !true { } ] , "if !true {}" , "if!true {}" ) ; // FIXME
151
+ c1 ! ( expr, [ if !true { } ] , "if !true {}" ) ;
153
152
c1 ! ( expr, [ if :: std:: blah( ) { } else { } ] , "if ::std::blah() {} else {}" ) ;
154
153
c1 ! ( expr, [ if let true = true { } else { } ] , "if let true = true {} else {}" ) ;
155
154
c1 ! ( expr,
@@ -212,7 +211,7 @@ fn test_expr() {
212
211
c2_match_arm ! (
213
212
[ { 1 } - 1 ] ,
214
213
"match () { _ => ({ 1 }) - 1, }" ,
215
- "match() { _ => { 1 } - 1 }" ,
214
+ "match () { _ => { 1 } - 1 }" ,
216
215
) ;
217
216
218
217
// ExprKind::Closure
@@ -655,11 +654,11 @@ fn test_stmt() {
655
654
c2 ! ( stmt, [ let _ ] , "let _;" , "let _" ) ;
656
655
c2 ! ( stmt, [ let x = true ] , "let x = true;" , "let x = true" ) ;
657
656
c2 ! ( stmt, [ let x: bool = true ] , "let x: bool = true;" , "let x: bool = true" ) ;
658
- c2 ! ( stmt, [ let ( a, b) = ( 1 , 2 ) ] , "let (a, b) = (1, 2);" , "let(a, b) = (1, 2)" ) ; // FIXME
657
+ c2 ! ( stmt, [ let ( a, b) = ( 1 , 2 ) ] , "let (a, b) = (1, 2);" , "let (a, b) = (1, 2)" ) ;
659
658
c2 ! ( stmt,
660
659
[ let ( a, b) : ( u32 , u32 ) = ( 1 , 2 ) ] ,
661
660
"let (a, b): (u32, u32) = (1, 2);" ,
662
- "let(a, b): (u32, u32) = (1, 2)" // FIXME
661
+ "let (a, b): (u32, u32) = (1, 2)"
663
662
) ;
664
663
macro_rules! c2_let_expr_minus_one {
665
664
( [ $expr: expr ] , $stmt_expected: expr, $tokens_expected: expr $( , ) ?) => {
@@ -776,8 +775,8 @@ fn test_ty() {
776
775
c1 ! ( ty, [ Ref <' a> ] , "Ref<'a>" ) ;
777
776
c1 ! ( ty, [ PhantomData <T > ] , "PhantomData<T>" ) ;
778
777
c2 ! ( ty, [ PhantomData :: <T > ] , "PhantomData<T>" , "PhantomData::<T>" ) ;
779
- c2 ! ( ty, [ Fn ( ) -> ! ] , "Fn() -> !" , "Fn() -> !") ;
780
- c2 ! ( ty, [ Fn ( u8 ) -> ! ] , "Fn(u8) -> !" , "Fn(u8) ->!" ) ; // FIXME
778
+ c1 ! ( ty, [ Fn ( ) -> ! ] , "Fn() -> !" ) ;
779
+ c1 ! ( ty, [ Fn ( u8 ) -> ! ] , "Fn(u8) -> !" ) ;
781
780
c1 ! ( ty, [ <Struct as Trait >:: Type ] , "<Struct as Trait>::Type" ) ;
782
781
783
782
// TyKind::TraitObject
@@ -857,16 +856,16 @@ fn test_punct() {
857
856
// Otherwise, any old proc macro that parses pretty-printed code might glue
858
857
// together tokens that shouldn't be glued.
859
858
p ! ( [ = = < < <= <= == == != != >= >= > > ] , "= = < < <= <= == == != != >= >= > >" ) ;
860
- p ! ( [ && && & & || || | | ! ! ] , "&& && & & || || | |! !" ) ; // FIXME
859
+ p ! ( [ && && & & || || | | ! ! ] , "&& && & & || || | | ! !" ) ;
861
860
p ! ( [ ~ ~ @ @ # # ] , "~ ~ @ @ # #" ) ;
862
- p ! ( [ . . .. .. ... ... ..= ..=] , ".. .. .. ... ... ..= ..=" ) ; // FIXME
863
- p ! ( [ , , ; ; : : :: :: ] , ",, ; ; : : :: ::" ) ; // FIXME
861
+ p ! ( [ . . .. .. ... ... ..= ..=] , ". . .. .. ... ... ..= ..=" ) ;
862
+ p ! ( [ , , ; ; : : :: :: ] , ", , ; ; : : :: ::" ) ;
864
863
p ! ( [ -> -> <- <- => =>] , "-> -> <- <- => =>" ) ;
865
- p ! ( [ $ $ ? ? ' ' ] , "$$ ? ? ' '" ) ; // FIXME
864
+ p ! ( [ $ $ ? ? ' ' ] , "$ $ ? ? ' '" ) ;
866
865
p ! ( [ + + += += - - -= -= * * *= *= / / /= /= ] , "+ + += += - - -= -= * * *= *= / / /= /=" ) ;
867
866
p ! ( [ % % %= %= ^ ^ ^= ^= << << <<= <<= >> >> >>= >>= ] ,
868
867
"% % %= %= ^ ^ ^= ^= << << <<= <<= >> >> >>= >>=" ) ;
869
- p ! ( [ +! ?= |> >>@ --> <-- $$ =====> ] , "+! ?= |> >>@ --> <-- $$=====>" ) ;
870
- p ! ( [ , ; ; , * * @@ $+$ >< <> ?? +== ] , ",; ;, ** @@ $+$>< <> ?? +==" ) ; // FIXME: `$ >` -> `$>`
868
+ p ! ( [ +! ?= |> >>@ --> <-- $$ =====> ] , "+! ?= |> >>@ --> <-- $$ =====>" ) ;
869
+ p ! ( [ , ; ; , * * @@ $+$ >< <> ?? +== ] , ",; ;, ** @@ $+$ >< <> ?? +==" ) ;
871
870
p ! ( [ : #!@|$=& * , +; * ~? ] , ":#!@|$=&*,+;*~?" ) ;
872
871
}
0 commit comments