mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc_mir_dataflow: use iter::once instead of Some().into_iter

Browse Source
This commit is contained in:
Michael Howell 2022-02-03 13:51:37 -07:00
parent 4e8fb743cc
commit a2a4cababe
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::util::IntTypeExt;
use rustc_middle::ty::{self, Ty, TyCtxt}; use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_target::abi::VariantIdx; use rustc_target::abi::VariantIdx;
use std::fmt; use std::{fmt, iter};
/// The value of an inserted drop flag. /// The value of an inserted drop flag.
#[derive(Debug, PartialEq, Eq, Copy, Clone)] #[derive(Debug, PartialEq, Eq, Copy, Clone)]
@ -329,8 +329,7 @@ fn drop_halfladder(
mut succ: BasicBlock, mut succ: BasicBlock,
fields: &[(Place<'tcx>, Option<D::Path>)], fields: &[(Place<'tcx>, Option<D::Path>)],
) -> Vec<BasicBlock> { ) -> Vec<BasicBlock> {
Some(succ) iter::once(succ)
.into_iter()
.chain(fields.iter().rev().zip(unwind_ladder).map(|(&(place, path), &unwind_succ)| { .chain(fields.iter().rev().zip(unwind_ladder).map(|(&(place, path), &unwind_succ)| {
succ = self.drop_subpath(place, path, succ, unwind_succ); succ = self.drop_subpath(place, path, succ, unwind_succ);
succ succ