Skip to content

Commit 5931794

Browse files
committed
Auto merge of rust-lang#120586 - ShE3py:exprkind-err, r=fmease
Add `ErrorGuaranteed` to `ast::ExprKind::Err` See rust-lang#119967 for context ``` \ \ _~^~^~_ \) / o o \ (/ '_ - _' / '-----' \ ``` r? fmease
2 parents b8fb890 + ef2039e commit 5931794

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

clippy_utils/src/ast_utils.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ pub fn eq_expr(l: &Expr, r: &Expr) -> bool {
143143
match (&l.kind, &r.kind) {
144144
(Paren(l), _) => eq_expr(l, r),
145145
(_, Paren(r)) => eq_expr(l, r),
146-
(Err, Err) => true,
146+
(Err(_), Err(_)) => true,
147+
(Dummy, _) | (_, Dummy) => unreachable!("comparing `ExprKind::Dummy`"),
147148
(Try(l), Try(r)) | (Await(l, _), Await(r, _)) => eq_expr(l, r),
148149
(Array(l), Array(r)) => over(l, r, |l, r| eq_expr(l, r)),
149150
(Tup(l), Tup(r)) => over(l, r, |l, r| eq_expr(l, r)),

clippy_utils/src/sugg.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@ impl<'a> Sugg<'a> {
222222
| ast::ExprKind::Array(..)
223223
| ast::ExprKind::While(..)
224224
| ast::ExprKind::Await(..)
225-
| ast::ExprKind::Err => Sugg::NonParen(snippet_with_context(cx, expr.span, ctxt, default, app).0),
225+
| ast::ExprKind::Err(_)
226+
| ast::ExprKind::Dummy => Sugg::NonParen(snippet_with_context(cx, expr.span, ctxt, default, app).0),
226227
ast::ExprKind::Range(ref lhs, ref rhs, RangeLimits::HalfOpen) => Sugg::BinOp(
227228
AssocOp::DotDot,
228229
lhs.as_ref().map_or("".into(), |lhs| {

0 commit comments

Comments
 (0)