Skip to content

Commit b3c31d5

Browse files
committed
clean up Colon from clippy
1 parent 73ebb2b commit b3c31d5

File tree

1 file changed

+6
-5
lines changed
  • src/tools/clippy/clippy_utils/src

1 file changed

+6
-5
lines changed

src/tools/clippy/clippy_utils/src/sugg.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ impl<'a> Sugg<'a> {
171171
get_snippet(rhs.span),
172172
),
173173
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)),
175176
}
176177
}
177178

@@ -265,8 +266,9 @@ impl<'a> Sugg<'a> {
265266
snippet_with_context(cx, lhs.span, ctxt, default, app).0,
266267
snippet_with_context(cx, ty.span, ctxt, default, app).0,
267268
),
269+
//FIXME(chenyukang), remove this after type ascription is removed from AST
268270
ast::ExprKind::Type(ref lhs, ref ty) => Sugg::BinOp(
269-
AssocOp::Colon,
271+
AssocOp::As,
270272
snippet_with_context(cx, lhs.span, ctxt, default, app).0,
271273
snippet_with_context(cx, ty.span, ctxt, default, app).0,
272274
),
@@ -399,7 +401,6 @@ fn binop_to_string(op: AssocOp, lhs: &str, rhs: &str) -> String {
399401
AssocOp::As => format!("{lhs} as {rhs}"),
400402
AssocOp::DotDot => format!("{lhs}..{rhs}"),
401403
AssocOp::DotDotEq => format!("{lhs}..={rhs}"),
402-
AssocOp::Colon => format!("{lhs}: {rhs}"),
403404
}
404405
}
405406

@@ -609,13 +610,13 @@ enum Associativity {
609610
#[must_use]
610611
fn associativity(op: AssocOp) -> Associativity {
611612
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,
613614
GreaterEqual, LAnd, LOr, Less, LessEqual, Modulus, Multiply, NotEqual, ShiftLeft, ShiftRight, Subtract,
614615
};
615616

616617
match op {
617618
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,
619620
Divide | Equal | Greater | GreaterEqual | Less | LessEqual | Modulus | NotEqual | ShiftLeft | ShiftRight
620621
| Subtract => Associativity::Left,
621622
DotDot | DotDotEq => Associativity::None,

0 commit comments

Comments
 (0)