@@ -171,7 +171,8 @@ impl<'a> Sugg<'a> {
171
171
get_snippet ( rhs. span ) ,
172
172
) ,
173
173
hir:: ExprKind :: Cast ( lhs, ty) => Sugg :: BinOp ( AssocOp :: As , get_snippet ( lhs. span ) , get_snippet ( ty. span ) ) ,
174
- hir:: ExprKind :: Type ( lhs, ty) => Sugg :: BinOp ( AssocOp :: Colon , get_snippet ( lhs. span ) , get_snippet ( ty. span ) ) ,
174
+ //FIXME(chenyukang), remove this after type ascription is removed from AST
175
+ hir:: ExprKind :: Type ( lhs, ty) => Sugg :: BinOp ( AssocOp :: As , get_snippet ( lhs. span ) , get_snippet ( ty. span ) ) ,
175
176
}
176
177
}
177
178
@@ -265,8 +266,9 @@ impl<'a> Sugg<'a> {
265
266
snippet_with_context ( cx, lhs. span , ctxt, default, app) . 0 ,
266
267
snippet_with_context ( cx, ty. span , ctxt, default, app) . 0 ,
267
268
) ,
269
+ //FIXME(chenyukang), remove this after type ascription is removed from AST
268
270
ast:: ExprKind :: Type ( ref lhs, ref ty) => Sugg :: BinOp (
269
- AssocOp :: Colon ,
271
+ AssocOp :: As ,
270
272
snippet_with_context ( cx, lhs. span , ctxt, default, app) . 0 ,
271
273
snippet_with_context ( cx, ty. span , ctxt, default, app) . 0 ,
272
274
) ,
@@ -399,7 +401,6 @@ fn binop_to_string(op: AssocOp, lhs: &str, rhs: &str) -> String {
399
401
AssocOp :: As => format ! ( "{lhs} as {rhs}" ) ,
400
402
AssocOp :: DotDot => format ! ( "{lhs}..{rhs}" ) ,
401
403
AssocOp :: DotDotEq => format ! ( "{lhs}..={rhs}" ) ,
402
- AssocOp :: Colon => format ! ( "{lhs}: {rhs}" ) ,
403
404
}
404
405
}
405
406
@@ -609,13 +610,13 @@ enum Associativity {
609
610
#[ must_use]
610
611
fn associativity ( op : AssocOp ) -> Associativity {
611
612
use rustc_ast:: util:: parser:: AssocOp :: {
612
- Add , As , Assign , AssignOp , BitAnd , BitOr , BitXor , Colon , Divide , DotDot , DotDotEq , Equal , Greater ,
613
+ Add , As , Assign , AssignOp , BitAnd , BitOr , BitXor , Divide , DotDot , DotDotEq , Equal , Greater ,
613
614
GreaterEqual , LAnd , LOr , Less , LessEqual , Modulus , Multiply , NotEqual , ShiftLeft , ShiftRight , Subtract ,
614
615
} ;
615
616
616
617
match op {
617
618
Assign | AssignOp ( _) => Associativity :: Right ,
618
- Add | BitAnd | BitOr | BitXor | LAnd | LOr | Multiply | As | Colon => Associativity :: Both ,
619
+ Add | BitAnd | BitOr | BitXor | LAnd | LOr | Multiply | As => Associativity :: Both ,
619
620
Divide | Equal | Greater | GreaterEqual | Less | LessEqual | Modulus | NotEqual | ShiftLeft | ShiftRight
620
621
| Subtract => Associativity :: Left ,
621
622
DotDot | DotDotEq => Associativity :: None ,
0 commit comments