Skip to content

Commit 764d4bc

Browse files
blyxyasblyxyas
committed
Fix tests
1 parent b02cb24 commit 764d4bc

8 files changed

+71
-57
lines changed

‎clippy_lints/src/if_let_mutex.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use rustc_hir::{Expr, ExprKind};
77
use rustc_lint::{LateContext, LateLintPass};
88
use rustc_session::declare_lint_pass;
99
use rustc_span::sym;
10+
use std::ops::ControlFlow;
1011

1112
declare_clippy_lint! {
1213
/// ### What it does
@@ -90,12 +91,14 @@ pub struct OppVisitor<'a, 'tcx> {
9091
}
9192

9293
impl<'tcx> Visitor<'tcx> for OppVisitor<'_, 'tcx> {
93-
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
94+
type Result = ControlFlow<()>;
95+
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) -> ControlFlow<()> {
9496
if let Some(mutex) = is_mutex_lock_call(self.cx, expr) {
9597
self.found_mutex = Some(mutex);
96-
return;
98+
return ControlFlow::Break(());
9799
}
98100
visit::walk_expr(self, expr);
101+
ControlFlow::Continue(())
99102
}
100103
}
101104

@@ -106,12 +109,14 @@ pub struct ArmVisitor<'a, 'tcx> {
106109
}
107110

108111
impl<'tcx> Visitor<'tcx> for ArmVisitor<'_, 'tcx> {
109-
fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
112+
type Result = ControlFlow<()>;
113+
fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) -> ControlFlow<()> {
110114
if let Some(mutex) = is_mutex_lock_call(self.cx, expr) {
111115
self.found_mutex = Some(mutex);
112-
return;
116+
return ControlFlow::Break(());
113117
}
114118
visit::walk_expr(self, expr);
119+
ControlFlow::Continue(())
115120
}
116121
}
117122

‎clippy_lints/src/lifetimes.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use rustc_session::declare_lint_pass;
2222
use rustc_span::def_id::LocalDefId;
2323
use rustc_span::symbol::{kw, Ident, Symbol};
2424
use rustc_span::Span;
25+
use std::ops::ControlFlow;
2526

2627
declare_clippy_lint! {
2728
/// ### What it does
@@ -699,10 +700,13 @@ struct BodyLifetimeChecker {
699700
}
700701

701702
impl<'tcx> Visitor<'tcx> for BodyLifetimeChecker {
703+
type Result = ControlFlow<()>;
702704
// for lifetimes as parameters of generics
703-
fn visit_lifetime(&mut self, lifetime: &'tcx Lifetime) {
705+
fn visit_lifetime(&mut self, lifetime: &'tcx Lifetime) -> ControlFlow<()> {
704706
if !lifetime.is_anonymous() && lifetime.ident.name != kw::StaticLifetime {
705707
self.lifetimes_used_in_body = true;
708+
return ControlFlow::Break(());
706709
}
710+
ControlFlow::Continue(())
707711
}
708712
}

‎clippy_lints/src/loops/mut_range_bound.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use rustc_lint::LateContext;
88
use rustc_middle::mir::FakeReadCause;
99
use rustc_middle::ty;
1010
use rustc_span::Span;
11+
use std::ops::ControlFlow;
1112

1213
pub(super) fn check(cx: &LateContext<'_>, arg: &Expr<'_>, body: &Expr<'_>) {
1314
if let Some(higher::Range {
@@ -114,7 +115,6 @@ impl MutatePairDelegate<'_, '_> {
114115
struct BreakAfterExprVisitor {
115116
hir_id: HirId,
116117
past_expr: bool,
117-
past_candidate: bool,
118118
break_after_expr: bool,
119119
}
120120

@@ -123,7 +123,6 @@ impl BreakAfterExprVisitor {
123123
let mut visitor = BreakAfterExprVisitor {
124124
hir_id,
125125
past_expr: false,
126-
past_candidate: false,
127126
break_after_expr: false,
128127
};
129128

@@ -135,21 +134,18 @@ impl BreakAfterExprVisitor {
135134
}
136135

137136
impl<'tcx> Visitor<'tcx> for BreakAfterExprVisitor {
138-
fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
139-
if self.past_candidate {
140-
return;
141-
}
142-
137+
type Result = ControlFlow<()>;
138+
fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) -> ControlFlow<()> {
143139
if expr.hir_id == self.hir_id {
144140
self.past_expr = true;
145141
} else if self.past_expr {
146142
if matches!(&expr.kind, ExprKind::Break(..)) {
147143
self.break_after_expr = true;
148144
}
149145

150-
self.past_candidate = true;
151-
} else {
152-
intravisit::walk_expr(self, expr);
146+
return ControlFlow::Break(());
153147
}
148+
intravisit::walk_expr(self, expr);
149+
ControlFlow::Continue(())
154150
}
155151
}

‎clippy_lints/src/loops/while_immutable_condition.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use rustc_hir::def_id::DefIdMap;
77
use rustc_hir::intravisit::{walk_expr, Visitor};
88
use rustc_hir::{Expr, ExprKind, HirIdSet, QPath};
99
use rustc_lint::LateContext;
10+
use std::ops::ControlFlow;
1011

1112
pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, cond: &'tcx Expr<'_>, expr: &'tcx Expr<'_>) {
1213
if constant(cx, cx.typeck_results(), cond).is_some() {
@@ -64,20 +65,18 @@ struct HasBreakOrReturnVisitor {
6465
}
6566

6667
impl<'tcx> Visitor<'tcx> for HasBreakOrReturnVisitor {
67-
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
68-
if self.has_break_or_return {
69-
return;
70-
}
71-
68+
type Result = ControlFlow<()>;
69+
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) -> ControlFlow<()> {
7270
match expr.kind {
7371
ExprKind::Ret(_) | ExprKind::Break(_, _) => {
7472
self.has_break_or_return = true;
75-
return;
73+
return ControlFlow::Break(());
7674
},
7775
_ => {},
7876
}
7977

8078
walk_expr(self, expr);
79+
ControlFlow::Continue(())
8180
}
8281
}
8382

‎clippy_lints/src/methods/option_map_unwrap_or.rs

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_hir::{ExprKind, HirId, Node, PatKind, Path, QPath};
1010
use rustc_lint::LateContext;
1111
use rustc_middle::hir::nested_filter;
1212
use rustc_span::{sym, Span};
13+
use std::ops::ControlFlow;
1314

1415
use super::MAP_UNWRAP_OR;
1516

@@ -157,23 +158,24 @@ struct ReferenceVisitor<'a, 'tcx> {
157158

158159
impl<'a, 'tcx> Visitor<'tcx> for ReferenceVisitor<'a, 'tcx> {
159160
type NestedFilter = nested_filter::All;
160-
fn visit_expr(&mut self, expr: &'tcx rustc_hir::Expr<'_>) {
161+
type Result = ControlFlow<()>;
162+
fn visit_expr(&mut self, expr: &'tcx rustc_hir::Expr<'_>) -> ControlFlow<()> {
161163
// If we haven't found a reference yet, check if this references
162164
// one of the locals that was moved in the `unwrap_or` argument.
163165
// We are only interested in exprs that appear before the `unwrap_or` call.
164-
if !self.found_reference {
165-
if expr.span < self.unwrap_or_span
166-
&& let ExprKind::Path(ref path) = expr.kind
167-
&& let QPath::Resolved(_, path) = path
168-
&& let Res::Local(local_id) = path.res
169-
&& let Node::Pat(pat) = self.cx.tcx.hir_node(local_id)
170-
&& let PatKind::Binding(_, local_id, ..) = pat.kind
171-
&& self.identifiers.contains(&local_id)
172-
{
173-
self.found_reference = true;
174-
}
175-
rustc_hir::intravisit::walk_expr(self, expr);
166+
if expr.span < self.unwrap_or_span
167+
&& let ExprKind::Path(ref path) = expr.kind
168+
&& let QPath::Resolved(_, path) = path
169+
&& let Res::Local(local_id) = path.res
170+
&& let Node::Pat(pat) = self.cx.tcx.hir_node(local_id)
171+
&& let PatKind::Binding(_, local_id, ..) = pat.kind
172+
&& self.identifiers.contains(&local_id)
173+
{
174+
self.found_reference = true;
175+
return ControlFlow::Break(());
176176
}
177+
rustc_hir::intravisit::walk_expr(self, expr);
178+
ControlFlow::Continue(())
177179
}
178180

179181
fn nested_visit_map(&mut self) -> Self::Map {

‎clippy_lints/src/redundant_closure_call.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use rustc_middle::lint::in_external_macro;
1414
use rustc_middle::ty;
1515
use rustc_session::declare_lint_pass;
1616
use rustc_span::ExpnKind;
17+
use std::ops::ControlFlow;
1718

1819
declare_clippy_lint! {
1920
/// ### What it does
@@ -54,12 +55,14 @@ impl ReturnVisitor {
5455
}
5556

5657
impl<'tcx> Visitor<'tcx> for ReturnVisitor {
57-
fn visit_expr(&mut self, ex: &'tcx hir::Expr<'tcx>) {
58+
type Result = ControlFlow<()>;
59+
fn visit_expr(&mut self, ex: &'tcx hir::Expr<'tcx>) -> ControlFlow<()> {
5860
if let ExprKind::Ret(_) | ExprKind::Match(.., hir::MatchSource::TryDesugar(_)) = ex.kind {
5961
self.found_return = true;
60-
} else {
61-
hir_visit::walk_expr(self, ex);
62+
return ControlFlow::Break(());
6263
}
64+
hir_visit::walk_expr(self, ex);
65+
ControlFlow::Continue(())
6366
}
6467
}
6568

‎clippy_lints/src/unconditional_recursion.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ use rustc_session::impl_lint_pass;
1616
use rustc_span::symbol::{kw, Ident};
1717
use rustc_span::{sym, Span};
1818
use rustc_trait_selection::error_reporting::traits::suggestions::ReturnsVisitor;
19+
use std::ops::ControlFlow;
1920

2021
declare_clippy_lint! {
2122
/// ### What it does
@@ -285,15 +286,13 @@ where
285286
'tcx: 'a,
286287
{
287288
type NestedFilter = nested_filter::OnlyBodies;
289+
type Result = ControlFlow<()>;
288290

289291
fn nested_visit_map(&mut self) -> Self::Map {
290292
self.map
291293
}
292294

293-
fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
294-
if self.found_default_call {
295-
return;
296-
}
295+
fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) -> ControlFlow<()> {
297296
walk_expr(self, expr);
298297

299298
if let ExprKind::Call(f, _) = expr.kind
@@ -305,7 +304,9 @@ where
305304
{
306305
self.found_default_call = true;
307306
span_error(self.cx, self.method_span, expr);
307+
return ControlFlow::Break(());
308308
}
309+
ControlFlow::Continue(())
309310
}
310311
}
311312

‎clippy_lints/src/unused_peekable.rs

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use rustc_lint::{LateContext, LateLintPass};
88
use rustc_middle::hir::nested_filter::OnlyBodies;
99
use rustc_session::declare_lint_pass;
1010
use rustc_span::sym;
11+
use std::ops::ControlFlow;
1112

1213
declare_clippy_lint! {
1314
/// ### What it does
@@ -113,16 +114,13 @@ impl<'a, 'tcx> PeekableVisitor<'a, 'tcx> {
113114

114115
impl<'tcx> Visitor<'tcx> for PeekableVisitor<'_, 'tcx> {
115116
type NestedFilter = OnlyBodies;
117+
type Result = ControlFlow<()>;
116118

117119
fn nested_visit_map(&mut self) -> Self::Map {
118120
self.cx.tcx.hir()
119121
}
120122

121-
fn visit_expr(&mut self, ex: &'tcx Expr<'tcx>) {
122-
if self.found_peek_call {
123-
return;
124-
}
125-
123+
fn visit_expr(&mut self, ex: &'tcx Expr<'tcx>) -> ControlFlow<()> {
126124
if path_to_local_id(ex, self.expected_hir_id) {
127125
for (_, node) in self.cx.tcx.hir().parent_iter(ex.hir_id) {
128126
match node {
@@ -137,14 +135,15 @@ impl<'tcx> Visitor<'tcx> for PeekableVisitor<'_, 'tcx> {
137135
&& func_did == into_iter_did
138136
{
139137
// Probably a for loop desugar, stop searching
140-
return;
138+
return ControlFlow::Continue(());
141139
}
142140

143141
if args.iter().any(|arg| arg_is_mut_peekable(self.cx, arg)) {
144142
self.found_peek_call = true;
143+
return ControlFlow::Break(());
145144
}
146145

147-
return;
146+
return ControlFlow::Continue(());
148147
},
149148
// Catch anything taking a Peekable mutably
150149
ExprKind::MethodCall(
@@ -163,57 +162,62 @@ impl<'tcx> Visitor<'tcx> for PeekableVisitor<'_, 'tcx> {
163162
&& arg_is_mut_peekable(self.cx, self_arg)
164163
{
165164
self.found_peek_call = true;
166-
return;
165+
return ControlFlow::Break(());
167166
}
168167

169168
// foo.some_method() excluding Iterator methods
170169
if remaining_args.iter().any(|arg| arg_is_mut_peekable(self.cx, arg))
171170
&& !is_trait_method(self.cx, expr, sym::Iterator)
172171
{
173172
self.found_peek_call = true;
174-
return;
173+
return ControlFlow::Break(());
175174
}
176175

177176
// foo.by_ref(), keep checking for `peek`
178177
if method_name == "by_ref" {
179178
continue;
180179
}
181180

182-
return;
181+
return ControlFlow::Continue(());
183182
},
184183
ExprKind::AddrOf(_, Mutability::Mut, _) | ExprKind::Unary(..) | ExprKind::DropTemps(_) => {
185184
},
186-
ExprKind::AddrOf(_, Mutability::Not, _) => return,
185+
ExprKind::AddrOf(_, Mutability::Not, _) => return ControlFlow::Continue(()),
187186
_ => {
188187
self.found_peek_call = true;
189-
return;
188+
return ControlFlow::Break(());
190189
},
191190
}
192191
},
193192
Node::LetStmt(LetStmt { init: Some(init), .. }) => {
194193
if arg_is_mut_peekable(self.cx, init) {
195194
self.found_peek_call = true;
195+
return ControlFlow::Break(());
196196
}
197197

198-
return;
198+
return ControlFlow::Continue(());
199199
},
200200
Node::Stmt(stmt) => {
201201
match stmt.kind {
202-
StmtKind::Let(_) | StmtKind::Item(_) => self.found_peek_call = true,
202+
StmtKind::Let(_) | StmtKind::Item(_) => {
203+
self.found_peek_call = true;
204+
return ControlFlow::Break(());
205+
},
203206
StmtKind::Expr(_) | StmtKind::Semi(_) => {},
204207
}
205208

206-
return;
209+
return ControlFlow::Continue(());
207210
},
208211
Node::Block(_) | Node::ExprField(_) => {},
209212
_ => {
210-
return;
213+
return ControlFlow::Continue(());
211214
},
212215
}
213216
}
214217
}
215218

216219
walk_expr(self, ex);
220+
ControlFlow::Continue(())
217221
}
218222
}
219223

0 commit comments

Comments
 (0)