diff options
| author | Michael Howell <michael@notriddle.com> | 2022-02-03 13:51:37 -0700 |
|---|---|---|
| committer | Michael Howell <michael@notriddle.com> | 2022-02-03 13:52:26 -0700 |
| commit | a2a4cababeafcc5d5de0b26ba6e0d630480220dc (patch) | |
| tree | 0084c23d5639ff8956e80bd0754e3e8272b0d8ec | |
| parent | 4e8fb743ccbec27344b2dd42de7057f41d4ebfdd (diff) | |
| download | rust-a2a4cababeafcc5d5de0b26ba6e0d630480220dc.tar.gz rust-a2a4cababeafcc5d5de0b26ba6e0d630480220dc.zip | |
rustc_mir_dataflow: use iter::once instead of Some().into_iter
| -rw-r--r-- | compiler/rustc_mir_dataflow/src/elaborate_drops.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_mir_dataflow/src/elaborate_drops.rs b/compiler/rustc_mir_dataflow/src/elaborate_drops.rs index 501bc96401a..a3294672f54 100644 --- a/compiler/rustc_mir_dataflow/src/elaborate_drops.rs +++ b/compiler/rustc_mir_dataflow/src/elaborate_drops.rs @@ -8,7 +8,7 @@ use rustc_middle::ty::subst::SubstsRef; 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 @@ where 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 |