Skip to content

Commit

Permalink
Rollup merge of rust-lang#135321 - matthiaskrgr:out_of_into, r=lqd
Browse files Browse the repository at this point in the history
remove more redundant into() conversions
  • Loading branch information
jhpratt authored Jan 10, 2025
2 parents ee521df + 1c61937 commit b557f1b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_hir_analysis/src/collect/predicates_of.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ pub(super) fn const_conditions<'tcx>(

icx.lowerer().lower_bounds(
tcx.types.self_param,
supertraits.into_iter(),
supertraits,
&mut bounds,
ty::List::empty(),
PredicateFilter::ConstIfConst,
Expand Down
5 changes: 2 additions & 3 deletions compiler/rustc_mir_transform/src/coverage/mappings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,8 @@ fn calc_test_vectors_index(conditions: &mut Vec<MCDCBranch>) -> usize {
})
.collect::<FxIndexMap<_, _>>();

let mut queue = std::collections::VecDeque::from_iter(
next_conditions.swap_remove(&ConditionId::START).into_iter(),
);
let mut queue =
std::collections::VecDeque::from_iter(next_conditions.swap_remove(&ConditionId::START));
num_paths_stats[ConditionId::START] = 1;
let mut decision_end_nodes = Vec::new();
while let Some(branch) = queue.pop_front() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ impl Subdiagnostic for LocalLabel<'_> {
for dtor in self.destructors {
dtor.add_to_diag_with(diag, f);
}
let msg = f(diag, crate::fluent_generated::mir_transform_label_local_epilogue.into());
let msg = f(diag, crate::fluent_generated::mir_transform_label_local_epilogue);
diag.span_label(self.span, msg);
}
}
Expand Down

0 comments on commit b557f1b

Please sign in to comment.