@@ -163,7 +163,8 @@ impl<'a> Sugg<'a> {
163
163
get_snippet ( rhs. span ) ,
164
164
) ,
165
165
hir:: ExprKind :: Cast ( lhs, ty) => Sugg :: BinOp ( AssocOp :: As , get_snippet ( lhs. span ) , get_snippet ( ty. span ) ) ,
166
- hir:: ExprKind :: Type ( lhs, ty) => Sugg :: BinOp ( AssocOp :: Colon , get_snippet ( lhs. span ) , get_snippet ( ty. span ) ) ,
166
+ //FIXME(chenyukang), remove this after type ascription is removed from AST
167
+ hir:: ExprKind :: Type ( lhs, ty) => Sugg :: BinOp ( AssocOp :: As , get_snippet ( lhs. span ) , get_snippet ( ty. span ) ) ,
167
168
}
168
169
}
169
170
@@ -258,8 +259,9 @@ impl<'a> Sugg<'a> {
258
259
snippet_with_context ( cx, lhs. span , ctxt, default, app) . 0 ,
259
260
snippet_with_context ( cx, ty. span , ctxt, default, app) . 0 ,
260
261
) ,
262
+ //FIXME(chenyukang), remove this after type ascription is removed from AST
261
263
ast:: ExprKind :: Type ( ref lhs, ref ty) => Sugg :: BinOp (
262
- AssocOp :: Colon ,
264
+ AssocOp :: As ,
263
265
snippet_with_context ( cx, lhs. span , ctxt, default, app) . 0 ,
264
266
snippet_with_context ( cx, ty. span , ctxt, default, app) . 0 ,
265
267
) ,
@@ -392,7 +394,6 @@ fn binop_to_string(op: AssocOp, lhs: &str, rhs: &str) -> String {
392
394
AssocOp :: As => format ! ( "{lhs} as {rhs}" ) ,
393
395
AssocOp :: DotDot => format ! ( "{lhs}..{rhs}" ) ,
394
396
AssocOp :: DotDotEq => format ! ( "{lhs}..={rhs}" ) ,
395
- AssocOp :: Colon => format ! ( "{lhs}: {rhs}" ) ,
396
397
}
397
398
}
398
399
@@ -602,13 +603,13 @@ enum Associativity {
602
603
#[ must_use]
603
604
fn associativity ( op : AssocOp ) -> Associativity {
604
605
use rustc_ast:: util:: parser:: AssocOp :: {
605
- Add , As , Assign , AssignOp , BitAnd , BitOr , BitXor , Colon , Divide , DotDot , DotDotEq , Equal , Greater ,
606
+ Add , As , Assign , AssignOp , BitAnd , BitOr , BitXor , Divide , DotDot , DotDotEq , Equal , Greater ,
606
607
GreaterEqual , LAnd , LOr , Less , LessEqual , Modulus , Multiply , NotEqual , ShiftLeft , ShiftRight , Subtract ,
607
608
} ;
608
609
609
610
match op {
610
611
Assign | AssignOp ( _) => Associativity :: Right ,
611
- Add | BitAnd | BitOr | BitXor | LAnd | LOr | Multiply | As | Colon => Associativity :: Both ,
612
+ Add | BitAnd | BitOr | BitXor | LAnd | LOr | Multiply | As => Associativity :: Both ,
612
613
Divide | Equal | Greater | GreaterEqual | Less | LessEqual | Modulus | NotEqual | ShiftLeft | ShiftRight
613
614
| Subtract => Associativity :: Left ,
614
615
DotDot | DotDotEq => Associativity :: None ,
0 commit comments