Skip to content

Commit e250bd1

Browse files
Suppress must_use for ControlFlow in rust-analyzer
1 parent 380ce74 commit e250bd1

File tree

10 files changed

+17
-17
lines changed

10 files changed

+17
-17
lines changed

src/tools/rust-analyzer/crates/hir-ty/src/chalk_db.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,19 @@ impl chalk_solve::RustIrDatabase<Interner> for ChalkContext<'_> {
145145
let mut result = vec![];
146146
if fps.is_empty() {
147147
debug!("Unrestricted search for {:?} impls...", trait_);
148-
self.for_trait_impls(trait_, self_ty_fp, |impls| {
148+
let _ = self.for_trait_impls(trait_, self_ty_fp, |impls| {
149149
result.extend(impls.for_trait(trait_).map(id_to_chalk));
150150
ControlFlow::Continue(())
151-
})
151+
});
152152
} else {
153-
self.for_trait_impls(trait_, self_ty_fp, |impls| {
153+
let _ = self.for_trait_impls(trait_, self_ty_fp, |impls| {
154154
result.extend(
155155
fps.iter().flat_map(move |fp| {
156156
impls.for_trait_and_self_ty(trait_, *fp).map(id_to_chalk)
157157
}),
158158
);
159159
ControlFlow::Continue(())
160-
})
160+
});
161161
};
162162

163163
debug!("impls_for_trait returned {} impls", result.len());

src/tools/rust-analyzer/crates/hir-ty/src/dyn_compatibility.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ pub fn dyn_compatibility_of_trait_query(
116116
trait_: TraitId,
117117
) -> Option<DynCompatibilityViolation> {
118118
let mut res = None;
119-
dyn_compatibility_of_trait_with_callback(db, trait_, &mut |osv| {
119+
let _ = dyn_compatibility_of_trait_with_callback(db, trait_, &mut |osv| {
120120
res = Some(osv);
121121
ControlFlow::Break(())
122122
});
@@ -597,7 +597,7 @@ fn contains_illegal_impl_trait_in_trait(
597597

598598
let ret = sig.skip_binders().ret();
599599
let mut visitor = OpaqueTypeCollector(FxHashSet::default());
600-
ret.visit_with(visitor.as_dyn(), DebruijnIndex::INNERMOST);
600+
let _ = ret.visit_with(visitor.as_dyn(), DebruijnIndex::INNERMOST);
601601

602602
// Since we haven't implemented RPITIT in proper way like rustc yet,
603603
// just check whether `ret` contains RPIT for now

src/tools/rust-analyzer/crates/hir-ty/src/dyn_compatibility/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn check_dyn_compatibility<'a>(
5353
continue;
5454
};
5555
let mut osvs = FxHashSet::default();
56-
dyn_compatibility_with_callback(&db, trait_id, &mut |osv| {
56+
let _ = dyn_compatibility_with_callback(&db, trait_id, &mut |osv| {
5757
osvs.insert(match osv {
5858
DynCompatibilityViolation::SizedSelf => SizedSelf,
5959
DynCompatibilityViolation::SelfReferential => SelfReferential,

src/tools/rust-analyzer/crates/hir-ty/src/infer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ impl<'a> InferenceContext<'a> {
11431143
non_assocs: FxHashMap::default(),
11441144
};
11451145
for ty in tait_candidates {
1146-
ty.visit_with(collector.as_dyn(), DebruijnIndex::INNERMOST);
1146+
let _ = ty.visit_with(collector.as_dyn(), DebruijnIndex::INNERMOST);
11471147
}
11481148

11491149
// Non-assoc TAITs can be define-used everywhere as long as they are

src/tools/rust-analyzer/crates/hir-ty/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ where
10331033
T: ?Sized + TypeVisitable<Interner>,
10341034
{
10351035
let mut collector = PlaceholderCollector { db, placeholders: FxHashSet::default() };
1036-
value.visit_with(&mut collector, DebruijnIndex::INNERMOST);
1036+
let _ = value.visit_with(&mut collector, DebruijnIndex::INNERMOST);
10371037
collector.placeholders.into_iter().collect()
10381038
}
10391039

src/tools/rust-analyzer/crates/hir-ty/src/method_resolution.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ pub(crate) fn iterate_method_candidates<T>(
596596
mut callback: impl FnMut(ReceiverAdjustments, AssocItemId, bool) -> Option<T>,
597597
) -> Option<T> {
598598
let mut slot = None;
599-
iterate_method_candidates_dyn(
599+
let _ = iterate_method_candidates_dyn(
600600
ty,
601601
db,
602602
env,

src/tools/rust-analyzer/crates/hir/src/attrs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ fn resolve_impl_trait_item(
260260
// attributes here. Use path resolution directly instead.
261261
//
262262
// FIXME: resolve type aliases (which are not yielded by iterate_path_candidates)
263-
method_resolution::iterate_path_candidates(
263+
let _ = method_resolution::iterate_path_candidates(
264264
&canonical,
265265
db,
266266
environment,

src/tools/rust-analyzer/crates/hir/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2911,7 +2911,7 @@ impl Trait {
29112911
db: &dyn HirDatabase,
29122912
) -> Option<Vec<DynCompatibilityViolation>> {
29132913
let mut violations = vec![];
2914-
hir_ty::dyn_compatibility::dyn_compatibility_with_callback(db, self.id, &mut |violation| {
2914+
let _ = hir_ty::dyn_compatibility::dyn_compatibility_with_callback(db, self.id, &mut |violation| {
29152915
violations.push(violation);
29162916
ControlFlow::Continue(())
29172917
});
@@ -5497,7 +5497,7 @@ impl Type {
54975497
.generic_def()
54985498
.map_or_else(|| TraitEnvironment::empty(krate.id), |d| db.trait_environment(d));
54995499

5500-
method_resolution::iterate_method_candidates_dyn(
5500+
let _ = method_resolution::iterate_method_candidates_dyn(
55015501
&canonical,
55025502
db,
55035503
environment,
@@ -5584,7 +5584,7 @@ impl Type {
55845584
.generic_def()
55855585
.map_or_else(|| TraitEnvironment::empty(krate.id), |d| db.trait_environment(d));
55865586

5587-
method_resolution::iterate_path_candidates(
5587+
let _ = method_resolution::iterate_path_candidates(
55885588
&canonical,
55895589
db,
55905590
environment,

src/tools/rust-analyzer/crates/ide-assists/src/handlers/extract_function.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ impl FunctionBody {
750750
ast::Stmt::Item(_) => (),
751751
ast::Stmt::LetStmt(stmt) => {
752752
if let Some(pat) = stmt.pat() {
753-
walk_pat(&pat, &mut |pat| {
753+
let _ = walk_pat(&pat, &mut |pat| {
754754
cb(pat);
755755
std::ops::ControlFlow::<(), ()>::Continue(())
756756
});

src/tools/rust-analyzer/crates/ide-db/src/syntax_helpers/node_ext.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pub fn walk_patterns_in_expr(start: &ast::Expr, cb: &mut dyn FnMut(ast::Pat)) {
121121
match ast::Stmt::cast(node.clone()) {
122122
Some(ast::Stmt::LetStmt(l)) => {
123123
if let Some(pat) = l.pat() {
124-
walk_pat(&pat, &mut |pat| {
124+
let _ = walk_pat(&pat, &mut |pat| {
125125
cb(pat);
126126
ControlFlow::<(), ()>::Continue(())
127127
});
@@ -159,7 +159,7 @@ pub fn walk_patterns_in_expr(start: &ast::Expr, cb: &mut dyn FnMut(ast::Pat)) {
159159
}
160160
} else if let Some(pat) = ast::Pat::cast(node) {
161161
preorder.skip_subtree();
162-
walk_pat(&pat, &mut |pat| {
162+
let _ = walk_pat(&pat, &mut |pat| {
163163
cb(pat);
164164
ControlFlow::<(), ()>::Continue(())
165165
});

0 commit comments

Comments
 (0)