Skip to content

Commit 7a6e87b

Browse files
Suppress must_use for ControlFlow in rust-analyzer
1 parent 7408d1c commit 7a6e87b

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
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
@@ -1037,7 +1037,7 @@ where
10371037
T: ?Sized + TypeVisitable<Interner>,
10381038
{
10391039
let mut collector = PlaceholderCollector { db, placeholders: FxHashSet::default() };
1040-
value.visit_with(&mut collector, DebruijnIndex::INNERMOST);
1040+
let _ = value.visit_with(&mut collector, DebruijnIndex::INNERMOST);
10411041
collector.placeholders.into_iter().collect()
10421042
}
10431043

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
@@ -2879,7 +2879,7 @@ impl Trait {
28792879
db: &dyn HirDatabase,
28802880
) -> Option<Vec<DynCompatibilityViolation>> {
28812881
let mut violations = vec![];
2882-
hir_ty::dyn_compatibility::dyn_compatibility_with_callback(db, self.id, &mut |violation| {
2882+
let _ = hir_ty::dyn_compatibility::dyn_compatibility_with_callback(db, self.id, &mut |violation| {
28832883
violations.push(violation);
28842884
ControlFlow::Continue(())
28852885
});
@@ -5461,7 +5461,7 @@ impl Type {
54615461
.generic_def()
54625462
.map_or_else(|| TraitEnvironment::empty(krate.id), |d| db.trait_environment(d));
54635463

5464-
method_resolution::iterate_method_candidates_dyn(
5464+
let _ = method_resolution::iterate_method_candidates_dyn(
54655465
&canonical,
54665466
db,
54675467
environment,
@@ -5548,7 +5548,7 @@ impl Type {
55485548
.generic_def()
55495549
.map_or_else(|| TraitEnvironment::empty(krate.id), |d| db.trait_environment(d));
55505550

5551-
method_resolution::iterate_path_candidates(
5551+
let _ = method_resolution::iterate_path_candidates(
55525552
&canonical,
55535553
db,
55545554
environment,

0 commit comments

Comments
 (0)