Skip to content

Commit b557f1b

Browse files
authored
Rollup merge of rust-lang#135321 - matthiaskrgr:out_of_into, r=lqd
remove more redundant into() conversions
2 parents ee521df + 1c61937 commit b557f1b

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

compiler/rustc_hir_analysis/src/collect/predicates_of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ pub(super) fn const_conditions<'tcx>(
10361036

10371037
icx.lowerer().lower_bounds(
10381038
tcx.types.self_param,
1039-
supertraits.into_iter(),
1039+
supertraits,
10401040
&mut bounds,
10411041
ty::List::empty(),
10421042
PredicateFilter::ConstIfConst,

compiler/rustc_mir_transform/src/coverage/mappings.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,8 @@ fn calc_test_vectors_index(conditions: &mut Vec<MCDCBranch>) -> usize {
367367
})
368368
.collect::<FxIndexMap<_, _>>();
369369

370-
let mut queue = std::collections::VecDeque::from_iter(
371-
next_conditions.swap_remove(&ConditionId::START).into_iter(),
372-
);
370+
let mut queue =
371+
std::collections::VecDeque::from_iter(next_conditions.swap_remove(&ConditionId::START));
373372
num_paths_stats[ConditionId::START] = 1;
374373
let mut decision_end_nodes = Vec::new();
375374
while let Some(branch) = queue.pop_front() {

compiler/rustc_mir_transform/src/lint_tail_expr_drop_order.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ impl Subdiagnostic for LocalLabel<'_> {
691691
for dtor in self.destructors {
692692
dtor.add_to_diag_with(diag, f);
693693
}
694-
let msg = f(diag, crate::fluent_generated::mir_transform_label_local_epilogue.into());
694+
let msg = f(diag, crate::fluent_generated::mir_transform_label_local_epilogue);
695695
diag.span_label(self.span, msg);
696696
}
697697
}

0 commit comments

Comments
 (0)