Skip to content

Commit 178e7c3

Browse files
spastorinospastorino
committed
Fix clippy
1 parent e45b6a0 commit 178e7c3

File tree

9 files changed

+27
-5
lines changed

9 files changed

+27
-5
lines changed

‎src/tools/clippy/clippy_lints/src/loops/never_loop.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ fn never_loop_expr<'tcx>(
160160
| ExprKind::UnsafeBinderCast(_, e, _) => never_loop_expr(cx, e, local_labels, main_loop_id),
161161
ExprKind::Let(let_expr) => never_loop_expr(cx, let_expr.init, local_labels, main_loop_id),
162162
ExprKind::Array(es) | ExprKind::Tup(es) => never_loop_expr_all(cx, es.iter(), local_labels, main_loop_id),
163+
ExprKind::Use(expr, _) => never_loop_expr(cx, expr, local_labels, main_loop_id),
163164
ExprKind::MethodCall(_, receiver, es, _) => {
164165
never_loop_expr_all(cx, once(receiver).chain(es.iter()), local_labels, main_loop_id)
165166
},

‎src/tools/clippy/clippy_lints/src/matches/manual_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ where
9999
});
100100
if let ExprKind::Path(QPath::Resolved(None, Path { res: Res::Local(l), .. })) = e.kind {
101101
match captures.get(l) {
102-
Some(CaptureKind::Value | CaptureKind::Ref(Mutability::Mut)) => return None,
102+
Some(CaptureKind::Value | CaptureKind::Use | CaptureKind::Ref(Mutability::Mut)) => return None,
103103
Some(CaptureKind::Ref(Mutability::Not)) if binding_ref_mutability == Mutability::Mut => {
104104
return None;
105105
},

‎src/tools/clippy/clippy_lints/src/option_if_let_else.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ fn try_get_option_occurrence<'tcx>(
175175
.then_some(())
176176
.and_then(|()| none_captures.get(local_id))
177177
}) {
178-
Some(CaptureKind::Value | CaptureKind::Ref(Mutability::Mut)) => return None,
178+
Some(CaptureKind::Value | CaptureKind::Use | CaptureKind::Ref(Mutability::Mut)) => return None,
179179
Some(CaptureKind::Ref(Mutability::Not)) if as_mut => return None,
180180
Some(CaptureKind::Ref(Mutability::Not)) | None => (),
181181
}

‎src/tools/clippy/clippy_lints/src/utils/author.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,11 @@ impl<'a, 'tcx> PrintVisitor<'a, 'tcx> {
427427
kind!("Tup({elements})");
428428
self.slice(elements, |e| self.expr(e));
429429
},
430+
ExprKind::Use(expr, _) => {
431+
bind!(self, expr);
432+
kind!("Use({expr})");
433+
self.expr(expr);
434+
},
430435
ExprKind::Binary(op, left, right) => {
431436
bind!(self, op, left, right);
432437
kind!("Binary({op}, {left}, {right})");
@@ -489,6 +494,7 @@ impl<'a, 'tcx> PrintVisitor<'a, 'tcx> {
489494
}) => {
490495
let capture_clause = match capture_clause {
491496
CaptureBy::Value { .. } => "Value { .. }",
497+
CaptureBy::Use { .. } => "Use { .. }",
492498
CaptureBy::Ref => "Ref",
493499
};
494500

‎src/tools/clippy/clippy_utils/src/eager_or_lazy.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ fn expr_eagerness<'tcx>(cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) -> EagernessS
291291
ExprKind::ConstBlock(_)
292292
| ExprKind::Array(_)
293293
| ExprKind::Tup(_)
294+
| ExprKind::Use(..)
294295
| ExprKind::Lit(_)
295296
| ExprKind::Cast(..)
296297
| ExprKind::Type(..)

‎src/tools/clippy/clippy_utils/src/hir_utils.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ impl HirEqInterExpr<'_, '_, '_> {
393393
&& over(lf, rf, |l, r| self.eq_expr_field(l, r))
394394
},
395395
(&ExprKind::Tup(l_tup), &ExprKind::Tup(r_tup)) => self.eq_exprs(l_tup, r_tup),
396+
(&ExprKind::Use(l_expr, _), &ExprKind::Use(r_expr, _)) => self.eq_expr(l_expr, r_expr),
396397
(&ExprKind::Type(le, lt), &ExprKind::Type(re, rt)) => self.eq_expr(le, re) && self.eq_ty(lt, rt),
397398
(&ExprKind::Unary(l_op, le), &ExprKind::Unary(r_op, re)) => l_op == r_op && self.eq_expr(le, re),
398399
(&ExprKind::Yield(le, _), &ExprKind::Yield(re, _)) => return self.eq_expr(le, re),
@@ -425,6 +426,7 @@ impl HirEqInterExpr<'_, '_, '_> {
425426
| &ExprKind::Ret(..)
426427
| &ExprKind::Struct(..)
427428
| &ExprKind::Tup(..)
429+
| &ExprKind::Use(..)
428430
| &ExprKind::Type(..)
429431
| &ExprKind::Unary(..)
430432
| &ExprKind::Yield(..)
@@ -1033,6 +1035,9 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
10331035
ExprKind::Tup(tup) => {
10341036
self.hash_exprs(tup);
10351037
},
1038+
ExprKind::Use(expr, _) => {
1039+
self.hash_expr(expr);
1040+
},
10361041
ExprKind::Unary(lop, le) => {
10371042
std::mem::discriminant(&lop).hash(&mut self.s);
10381043
self.hash_expr(le);

‎src/tools/clippy/clippy_utils/src/lib.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,7 @@ pub fn can_move_expr_to_closure_no_visit<'tcx>(
10421042
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
10431043
pub enum CaptureKind {
10441044
Value,
1045+
Use,
10451046
Ref(Mutability),
10461047
}
10471048
impl CaptureKind {
@@ -1054,6 +1055,7 @@ impl std::ops::BitOr for CaptureKind {
10541055
fn bitor(self, rhs: Self) -> Self::Output {
10551056
match (self, rhs) {
10561057
(CaptureKind::Value, _) | (_, CaptureKind::Value) => CaptureKind::Value,
1058+
(CaptureKind::Use, _) | (_, CaptureKind::Use) => CaptureKind::Use,
10571059
(CaptureKind::Ref(Mutability::Mut), CaptureKind::Ref(_))
10581060
| (CaptureKind::Ref(_), CaptureKind::Ref(Mutability::Mut)) => CaptureKind::Ref(Mutability::Mut),
10591061
(CaptureKind::Ref(Mutability::Not), CaptureKind::Ref(Mutability::Not)) => CaptureKind::Ref(Mutability::Not),
@@ -1134,7 +1136,7 @@ pub fn capture_local_usage(cx: &LateContext<'_>, e: &Expr<'_>) -> CaptureKind {
11341136
},
11351137
ExprKind::Let(let_expr) => {
11361138
let mutability = match pat_capture_kind(cx, let_expr.pat) {
1137-
CaptureKind::Value => Mutability::Not,
1139+
CaptureKind::Value | CaptureKind::Use => Mutability::Not,
11381140
CaptureKind::Ref(m) => m,
11391141
};
11401142
return CaptureKind::Ref(mutability);
@@ -1143,7 +1145,7 @@ pub fn capture_local_usage(cx: &LateContext<'_>, e: &Expr<'_>) -> CaptureKind {
11431145
let mut mutability = Mutability::Not;
11441146
for capture in arms.iter().map(|arm| pat_capture_kind(cx, arm.pat)) {
11451147
match capture {
1146-
CaptureKind::Value => break,
1148+
CaptureKind::Value | CaptureKind::Use => break,
11471149
CaptureKind::Ref(Mutability::Mut) => mutability = Mutability::Mut,
11481150
CaptureKind::Ref(Mutability::Not) => (),
11491151
}
@@ -1153,7 +1155,7 @@ pub fn capture_local_usage(cx: &LateContext<'_>, e: &Expr<'_>) -> CaptureKind {
11531155
_ => break,
11541156
},
11551157
Node::LetStmt(l) => match pat_capture_kind(cx, l.pat) {
1156-
CaptureKind::Value => break,
1158+
CaptureKind::Value | CaptureKind::Use => break,
11571159
capture @ CaptureKind::Ref(_) => return capture,
11581160
},
11591161
_ => break,
@@ -1208,6 +1210,8 @@ pub fn can_move_expr_to_closure<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'
12081210
if !self.locals.contains(&local_id) {
12091211
let capture = match capture.info.capture_kind {
12101212
UpvarCapture::ByValue => CaptureKind::Value,
1213+
// FIXME add a CaptureKind::Use
1214+
UpvarCapture::ByUse => CaptureKind::Use,
12111215
UpvarCapture::ByRef(kind) => match kind {
12121216
BorrowKind::Immutable => CaptureKind::Ref(Mutability::Not),
12131217
BorrowKind::UniqueImmutable | BorrowKind::Mutable => {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ impl<'a> Sugg<'a> {
151151
| ExprKind::Become(..)
152152
| ExprKind::Struct(..)
153153
| ExprKind::Tup(..)
154+
| ExprKind::Use(..)
154155
| ExprKind::Err(_)
155156
| ExprKind::UnsafeBinderCast(..) => Sugg::NonParen(get_snippet(expr.span)),
156157
ExprKind::DropTemps(inner) => Self::hir_from_snippet(inner, get_snippet),
@@ -223,6 +224,7 @@ impl<'a> Sugg<'a> {
223224
| ast::ExprKind::Try(..)
224225
| ast::ExprKind::TryBlock(..)
225226
| ast::ExprKind::Tup(..)
227+
| ast::ExprKind::Use(..)
226228
| ast::ExprKind::Array(..)
227229
| ast::ExprKind::While(..)
228230
| ast::ExprKind::Await(..)

‎src/tools/clippy/clippy_utils/src/visitors.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,9 @@ pub fn for_each_unconsumed_temporary<'tcx, B>(
649649
helper(typeck, true, arg, f)?;
650650
}
651651
},
652+
ExprKind::Use(expr, _) => {
653+
helper(typeck, true, expr, f)?;
654+
},
652655
ExprKind::Index(borrowed, consumed, _)
653656
| ExprKind::Assign(borrowed, consumed, _)
654657
| ExprKind::AssignOp(_, borrowed, consumed) => {

0 commit comments

Comments
 (0)