languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-20 15:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #93631 - notriddle:notriddle/cleanup-some-into-iter, r=oli-obk

Browse source 
rustc_mir_dataflow: use iter::once instead of Some().into_iter
This commit is contained in:
Matthias Krüger 2022-02-04 14:59:06 +01:00 committed by GitHub
parent 03cad867a6 a2a4cababe
commit 4b7035918c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_mir_dataflow/src/elaborate_drops.rs
View file

@ -8,7 +8,7 @@
use rustc_middle::ty::util::IntTypeExt;
use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_target::abi::VariantIdx;
use std::fmt;
use std::{fmt, iter};
/// The value of an inserted drop flag.
#[derive(Debug, PartialEq, Eq, Copy, Clone)]
@ -329,8 +329,7 @@ fn drop_halfladder(
mut succ: BasicBlock,
fields: &[(Place<'tcx>, Option<D::Path>)],
) -> Vec<BasicBlock> {
Some(succ)
.into_iter()
iter::once(succ)
.chain(fields.iter().rev().zip(unwind_ladder).map(|(&(place, path), &unwind_succ)| {
succ = self.drop_subpath(place, path, succ, unwind_succ);
succ