Skip to content

Commit be05190

Browse files
camsteffencamsteffen
committed
Fix dogfood
1 parent 9309ce0 commit be05190

18 files changed

+41
-56
lines changed

‎clippy_lints/src/assertions_on_constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ enum AssertKind {
118118
fn match_assert_with_message<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Option<AssertKind> {
119119
if_chain! {
120120
if let Some(higher::If { cond, then, .. }) = higher::If::hir(expr);
121-
if let ExprKind::Unary(UnOp::Not, ref expr) = cond.kind;
121+
if let ExprKind::Unary(UnOp::Not, expr) = cond.kind;
122122
// bind the first argument of the `assert!` macro
123123
if let Some((Constant::Bool(is_true), _)) = constant(cx, cx.typeck_results(), expr);
124124
// block

‎clippy_lints/src/floating_point_arithmetic.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,6 @@ fn check_powi(cx: &LateContext<'_>, expr: &Expr<'_>, args: &[Expr<'_>]) {
332332
),
333333
Applicability::MachineApplicable,
334334
);
335-
336-
return;
337335
}
338336
}
339337
}

‎clippy_lints/src/functions/must_use.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ pub(super) fn check_item(cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
2626
let fn_header_span = item.span.with_hi(sig.decl.output.span().hi());
2727
if let Some(attr) = attr {
2828
check_needless_must_use(cx, sig.decl, item.hir_id(), item.span, fn_header_span, attr);
29-
return;
3029
} else if is_public && !is_proc_macro(cx.sess(), attrs) && !attrs.iter().any(|a| a.has_name(sym::no_mangle)) {
3130
check_must_use_candidate(
3231
cx,

‎clippy_lints/src/if_let_some_result.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ impl<'tcx> LateLintPass<'tcx> for OkIfLet {
4646
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
4747
if_chain! { //begin checking variables
4848
if let Some(higher::IfLet { let_pat, let_expr, .. }) = higher::IfLet::hir(cx, expr);
49-
if let ExprKind::MethodCall(_, ok_span, ref result_types, _) = let_expr.kind; //check is expr.ok() has type Result<T,E>.ok(, _)
50-
if let PatKind::TupleStruct(QPath::Resolved(_, ref x), ref y, _) = let_pat.kind; //get operation
49+
if let ExprKind::MethodCall(_, ok_span, result_types, _) = let_expr.kind; //check is expr.ok() has type Result<T,E>.ok(, _)
50+
if let PatKind::TupleStruct(QPath::Resolved(_, x), y, _) = let_pat.kind; //get operation
5151
if method_chain_args(let_expr, &["ok"]).is_some(); //test to see if using ok() methoduse std::marker::Sized;
5252
if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(&result_types[0]), sym::result_type);
5353
if rustc_hir_pretty::to_string(rustc_hir_pretty::NO_ANN, |s| s.print_path(x, false)) == "Some";

‎clippy_lints/src/loops/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ impl<'tcx> LateLintPass<'tcx> for Loops {
580580

581581
while_let_on_iterator::check(cx, expr);
582582

583-
if let Some(higher::While { if_cond, if_then, .. }) = higher::While::hir(&expr) {
583+
if let Some(higher::While { if_cond, if_then, .. }) = higher::While::hir(expr) {
584584
while_immutable_condition::check(cx, if_cond, if_then);
585585
}
586586

‎clippy_lints/src/loops/while_let_loop.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ pub(super) fn check(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, loop_block: &'
2424
}
2525
}
2626

27-
if let ExprKind::Match(ref matchexpr, ref arms, MatchSource::Normal) = inner.kind {
27+
if let ExprKind::Match(matchexpr, arms, MatchSource::Normal) = inner.kind {
2828
if arms.len() == 2
2929
&& arms[0].guard.is_none()
3030
&& arms[1].guard.is_none()
31-
&& is_simple_break_expr(&arms[1].body)
31+
&& is_simple_break_expr(arms[1].body)
3232
{
33-
could_be_while_let(cx, expr, &arms[0].pat, matchexpr);
33+
could_be_while_let(cx, expr, arms[0].pat, matchexpr);
3434
}
3535
}
3636
}

‎clippy_lints/src/matches.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ impl<'tcx> LateLintPass<'tcx> for Matches {
631631
check_match_single_binding(cx, ex, arms, expr);
632632
}
633633
}
634-
if let ExprKind::Match(ref ex, ref arms, _) = expr.kind {
634+
if let ExprKind::Match(ex, arms, _) = expr.kind {
635635
check_match_ref_pats(cx, ex, arms.iter().map(|el| el.pat), expr);
636636
}
637637
if let Some(higher::IfLet { let_pat, let_expr, .. }) = higher::IfLet::hir(cx, expr) {
@@ -1194,7 +1194,7 @@ where
11941194

11951195
let (first_sugg, msg, title);
11961196
let span = ex.span.source_callsite();
1197-
if let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, ref inner) = ex.kind {
1197+
if let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner) = ex.kind {
11981198
first_sugg = once((span, Sugg::hir_with_macro_callsite(cx, inner, "..").to_string()));
11991199
msg = "try";
12001200
title = "you don't need to add `&` to both the expression and the patterns";
@@ -1205,7 +1205,7 @@ where
12051205
}
12061206

12071207
let remaining_suggs = pats.filter_map(|pat| {
1208-
if let PatKind::Ref(ref refp, _) = pat.kind {
1208+
if let PatKind::Ref(refp, _) = pat.kind {
12091209
Some((pat.span, snippet(cx, refp.span, "..").to_string()))
12101210
} else {
12111211
None
@@ -1365,7 +1365,7 @@ where
13651365
find_bool_lit(&arm.2.kind, is_if_let).map_or(false, |b| b == b0) && arm.3.is_none() && arm.0.is_empty()
13661366
});
13671367
then {
1368-
if let Some(ref last_pat) = last_pat_opt {
1368+
if let Some(last_pat) = last_pat_opt {
13691369
if !is_wild(last_pat) {
13701370
return false;
13711371
}
@@ -1827,13 +1827,13 @@ mod redundant_pattern_match {
18271827
..
18281828
}) = higher::IfLet::hir(cx, expr)
18291829
{
1830-
find_sugg_for_if_let(cx, expr, let_pat, let_expr, "if", if_else.is_some())
1830+
find_sugg_for_if_let(cx, expr, let_pat, let_expr, "if", if_else.is_some());
18311831
}
18321832
if let ExprKind::Match(op, arms, MatchSource::Normal) = &expr.kind {
1833-
find_sugg_for_match(cx, expr, op, arms)
1833+
find_sugg_for_match(cx, expr, op, arms);
18341834
}
18351835
if let Some(higher::WhileLet { let_pat, let_expr, .. }) = higher::WhileLet::hir(expr) {
1836-
find_sugg_for_if_let(cx, expr, let_pat, let_expr, "while", false)
1836+
find_sugg_for_if_let(cx, expr, let_pat, let_expr, "while", false);
18371837
}
18381838
}
18391839

‎clippy_lints/src/pattern_type_mismatch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ impl<'tcx> LateLintPass<'tcx> for PatternTypeMismatch {
118118
}
119119
}
120120
if let ExprKind::Let(let_pat, let_expr, _) = expr.kind {
121-
if let Some(ref expr_ty) = cx.typeck_results().node_type_opt(let_expr.hir_id) {
121+
if let Some(expr_ty) = cx.typeck_results().node_type_opt(let_expr.hir_id) {
122122
if in_external_macro(cx.sess(), let_pat.span) {
123123
return;
124124
}

‎clippy_lints/src/question_mark.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl QuestionMark {
106106
if let PatKind::Binding(annot, bind_id, _, _) = fields[0].kind;
107107
let by_ref = matches!(annot, BindingAnnotation::Ref | BindingAnnotation::RefMut);
108108

109-
if let ExprKind::Block(ref block, None) = if_then.kind;
109+
if let ExprKind::Block(block, None) = if_then.kind;
110110
if block.stmts.is_empty();
111111
if let Some(trailing_expr) = &block.expr;
112112
if path_to_local_id(trailing_expr, bind_id);

‎clippy_lints/src/ranges.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ fn check_range_zip_with_len(cx: &LateContext<'_>, path: &PathSegment<'_>, args:
337337
// `.iter()` and `.len()` called on same `Path`
338338
if let ExprKind::Path(QPath::Resolved(_, iter_path)) = iter_args[0].kind;
339339
if let ExprKind::Path(QPath::Resolved(_, len_path)) = len_args[0].kind;
340-
if SpanlessEq::new(cx).eq_path_segments(&iter_path.segments, &len_path.segments);
340+
if SpanlessEq::new(cx).eq_path_segments(iter_path.segments, len_path.segments);
341341
then {
342342
span_lint(cx,
343343
RANGE_ZIP_WITH_LEN,

‎clippy_lints/src/redundant_closure_call.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ impl ReturnVisitor {
5151

5252
impl<'ast> ast_visit::Visitor<'ast> for ReturnVisitor {
5353
fn visit_expr(&mut self, ex: &'ast ast::Expr) {
54-
if let ast::ExprKind::Ret(_) = ex.kind {
55-
self.found_return = true;
56-
} else if let ast::ExprKind::Try(_) = ex.kind {
54+
if let ast::ExprKind::Ret(_) | ast::ExprKind::Try(_) = ex.kind {
5755
self.found_return = true;
5856
}
5957

‎clippy_lints/src/returns.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,10 @@ fn check_final_expr<'tcx>(
206206
// an if/if let expr, check both exprs
207207
// note, if without else is going to be a type checking error anyways
208208
// (except for unit type functions) so we don't match it
209-
ExprKind::Match(_, arms, source) => match source {
210-
MatchSource::Normal => {
211-
for arm in arms.iter() {
212-
check_final_expr(cx, arm.body, Some(arm.body.span), RetReplacement::Block);
213-
}
214-
},
215-
_ => (),
209+
ExprKind::Match(_, arms, MatchSource::Normal) => {
210+
for arm in arms.iter() {
211+
check_final_expr(cx, arm.body, Some(arm.body.span), RetReplacement::Block);
212+
}
216213
},
217214
ExprKind::DropTemps(expr) => check_final_expr(cx, expr, None, RetReplacement::Empty),
218215
_ => (),

‎clippy_lints/src/unused_async.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clippy_utils::diagnostics::span_lint_and_help;
22
use rustc_hir::intravisit::{walk_expr, walk_fn, FnKind, NestedVisitorMap, Visitor};
3-
use rustc_hir::{Body, Expr, ExprKind, FnDecl, FnHeader, HirId, IsAsync, Item, ItemKind, YieldSource};
3+
use rustc_hir::{Body, Expr, ExprKind, FnDecl, FnHeader, HirId, IsAsync, YieldSource};
44
use rustc_lint::{LateContext, LateLintPass};
55
use rustc_middle::hir::map::Map;
66
use rustc_session::{declare_lint_pass, declare_tool_lint};
@@ -57,11 +57,6 @@ impl<'a, 'tcx> Visitor<'tcx> for AsyncFnVisitor<'a, 'tcx> {
5757
}
5858

5959
impl<'tcx> LateLintPass<'tcx> for UnusedAsync {
60-
fn check_item(&mut self, _: &LateContext<'tcx>, item: &'tcx Item<'tcx>) {
61-
if let ItemKind::Trait(..) = item.kind {
62-
return;
63-
}
64-
}
6560
fn check_fn(
6661
&mut self,
6762
cx: &LateContext<'tcx>,

‎clippy_lints/src/utils/inspector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ fn print_expr(cx: &LateContext<'_>, expr: &hir::Expr<'_>, indent: usize) {
142142
print_expr(cx, arg, indent + 1);
143143
}
144144
},
145-
hir::ExprKind::Let(ref pat, ref expr, _) => {
145+
hir::ExprKind::Let(pat, expr, _) => {
146146
print_pat(cx, pat, indent + 1);
147147
print_expr(cx, expr, indent + 1);
148148
},

‎clippy_lints/src/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl<'tcx> LateLintPass<'tcx> for UselessVec {
4949
if_chain! {
5050
if let ty::Ref(_, ty, _) = cx.typeck_results().expr_ty_adjusted(expr).kind();
5151
if let ty::Slice(..) = ty.kind();
52-
if let ExprKind::AddrOf(BorrowKind::Ref, mutability, ref addressee) = expr.kind;
52+
if let ExprKind::AddrOf(BorrowKind::Ref, mutability, addressee) = expr.kind;
5353
if let Some(vec_args) = higher::VecArgs::hir(cx, addressee);
5454
then {
5555
self.check_vec_macro(cx, &vec_args, mutability, expr.span);

‎clippy_utils/src/higher.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ impl<'tcx> ForLoop<'tcx> {
2323
#[inline]
2424
pub fn hir(expr: &Expr<'tcx>) -> Option<Self> {
2525
if_chain! {
26-
if let hir::ExprKind::Match(ref iterexpr, ref arms, hir::MatchSource::ForLoopDesugar) = expr.kind;
26+
if let hir::ExprKind::Match(iterexpr, arms, hir::MatchSource::ForLoopDesugar) = expr.kind;
2727
if let Some(first_arm) = arms.get(0);
28-
if let hir::ExprKind::Call(_, ref iterargs) = iterexpr.kind;
28+
if let hir::ExprKind::Call(_, iterargs) = iterexpr.kind;
2929
if let Some(first_arg) = iterargs.get(0);
3030
if iterargs.len() == 1 && arms.len() == 1 && first_arm.guard.is_none();
31-
if let hir::ExprKind::Loop(ref block, ..) = first_arm.body.kind;
31+
if let hir::ExprKind::Loop(block, ..) = first_arm.body.kind;
3232
if block.expr.is_none();
3333
if let [ _, _, ref let_stmt, ref body ] = *block.stmts;
34-
if let hir::StmtKind::Local(ref local) = let_stmt.kind;
35-
if let hir::StmtKind::Expr(ref body_expr) = body.kind;
34+
if let hir::StmtKind::Local(local) = let_stmt.kind;
35+
if let hir::StmtKind::Expr(body_expr) = body.kind;
3636
then {
3737
return Some(Self {
3838
pat: &*local.pat,
@@ -189,7 +189,7 @@ impl<'a> Range<'a> {
189189
}
190190

191191
match expr.kind {
192-
hir::ExprKind::Call(ref path, ref args)
192+
hir::ExprKind::Call(path, args)
193193
if matches!(
194194
path.kind,
195195
hir::ExprKind::Path(hir::QPath::LangItem(hir::LangItem::RangeInclusiveNew, _))
@@ -201,7 +201,7 @@ impl<'a> Range<'a> {
201201
limits: ast::RangeLimits::Closed,
202202
})
203203
},
204-
hir::ExprKind::Struct(ref path, ref fields, None) => match path {
204+
hir::ExprKind::Struct(path, fields, None) => match &path {
205205
hir::QPath::LangItem(hir::LangItem::RangeFull, _) => Some(Range {
206206
start: None,
207207
end: None,
@@ -247,7 +247,7 @@ impl<'a> VecArgs<'a> {
247247
/// from `vec!`.
248248
pub fn hir(cx: &LateContext<'_>, expr: &'a hir::Expr<'_>) -> Option<VecArgs<'a>> {
249249
if_chain! {
250-
if let hir::ExprKind::Call(ref fun, ref args) = expr.kind;
250+
if let hir::ExprKind::Call(fun, args) = expr.kind;
251251
if let hir::ExprKind::Path(ref qpath) = fun.kind;
252252
if is_expn_of(fun.span, "vec").is_some();
253253
if let Some(fun_def_id) = cx.qpath_res(qpath, fun.hir_id).opt_def_id();
@@ -259,10 +259,10 @@ impl<'a> VecArgs<'a> {
259259
else if match_def_path(cx, fun_def_id, &paths::SLICE_INTO_VEC) && args.len() == 1 {
260260
// `vec![a, b, c]` case
261261
if_chain! {
262-
if let hir::ExprKind::Box(ref boxed) = args[0].kind;
263-
if let hir::ExprKind::Array(ref args) = boxed.kind;
262+
if let hir::ExprKind::Box(boxed) = args[0].kind;
263+
if let hir::ExprKind::Array(args) = boxed.kind;
264264
then {
265-
return Some(VecArgs::Vec(&*args));
265+
return Some(VecArgs::Vec(args));
266266
}
267267
}
268268

@@ -566,7 +566,7 @@ pub fn is_from_for_desugar(local: &hir::Local<'_>) -> bool {
566566
// }
567567
// ```
568568
if_chain! {
569-
if let Some(ref expr) = local.init;
569+
if let Some(expr) = local.init;
570570
if let hir::ExprKind::Match(_, _, hir::MatchSource::ForLoopDesugar) = expr.kind;
571571
then {
572572
return true;

‎clippy_utils/src/hir_utils.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,7 @@ impl HirEqInterExpr<'_, '_, '_> {
232232
(&ExprKind::If(lc, lt, ref le), &ExprKind::If(rc, rt, ref re)) => {
233233
self.eq_expr(lc, rc) && self.eq_expr(&**lt, &**rt) && both(le, re, |l, r| self.eq_expr(l, r))
234234
},
235-
(&ExprKind::Let(ref lp, ref le, _), &ExprKind::Let(ref rp, ref re, _)) => {
236-
self.eq_pat(lp, rp) && self.eq_expr(le, re)
237-
},
235+
(&ExprKind::Let(lp, le, _), &ExprKind::Let(rp, re, _)) => self.eq_pat(lp, rp) && self.eq_expr(le, re),
238236
(&ExprKind::Lit(ref l), &ExprKind::Lit(ref r)) => l.node == r.node,
239237
(&ExprKind::Loop(lb, ref ll, ref lls, _), &ExprKind::Loop(rb, ref rl, ref rls, _)) => {
240238
lls == rls && self.eq_block(lb, rb) && both(ll, rl, |l, r| l.ident.name == r.ident.name)
@@ -668,7 +666,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
668666
}
669667
}
670668
},
671-
ExprKind::Let(ref pat, ref expr, _) => {
669+
ExprKind::Let(pat, expr, _) => {
672670
self.hash_expr(expr);
673671
self.hash_pat(pat);
674672
},

‎clippy_utils/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,13 +1598,13 @@ pub fn if_sequence<'tcx>(mut expr: &'tcx Expr<'tcx>) -> (Vec<&'tcx Expr<'tcx>>,
15981598

15991599
while let Some(higher::IfOrIfLet { cond, then, r#else }) = higher::IfOrIfLet::hir(expr) {
16001600
conds.push(&*cond);
1601-
if let ExprKind::Block(ref block, _) = then.kind {
1601+
if let ExprKind::Block(block, _) = then.kind {
16021602
blocks.push(block);
16031603
} else {
16041604
panic!("ExprKind::If node is not an ExprKind::Block");
16051605
}
16061606

1607-
if let Some(ref else_expr) = r#else {
1607+
if let Some(else_expr) = r#else {
16081608
expr = else_expr;
16091609
} else {
16101610
break;

0 commit comments

Comments
 (0)