diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-06-16 12:41:24 +0300 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-06-18 18:10:26 +0300 |
| commit | ea78c3aa33c09f987c4ad0d87b9a39a0d065d67c (patch) | |
| tree | 09d4c7285c9dcade08d278eb3d46bb8d3c8df9e1 /src/librustc_codegen_ssa/mir | |
| parent | 4c4fc7512eff62f5cc63a1a30f4474db003884c9 (diff) | |
| download | rust-ea78c3aa33c09f987c4ad0d87b9a39a0d065d67c.tar.gz rust-ea78c3aa33c09f987c4ad0d87b9a39a0d065d67c.zip | |
Run `rustfmt --file-lines ...` for changes from previous commits.
Diffstat (limited to 'src/librustc_codegen_ssa/mir')
| -rw-r--r-- | src/librustc_codegen_ssa/mir/analyze.rs | 7 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/mir/mod.rs | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/librustc_codegen_ssa/mir/analyze.rs b/src/librustc_codegen_ssa/mir/analyze.rs index 3d41eddb803..0289150a5e4 100644 --- a/src/librustc_codegen_ssa/mir/analyze.rs +++ b/src/librustc_codegen_ssa/mir/analyze.rs @@ -13,7 +13,7 @@ use super::FunctionCx; use crate::traits::*; pub fn non_ssa_locals<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>( - fx: &FunctionCx<'a, 'tcx, Bx> + fx: &FunctionCx<'a, 'tcx, Bx>, ) -> BitSet<mir::Local> { let mir = fx.mir; let mut analyzer = LocalAnalyzer::new(fx); @@ -49,7 +49,7 @@ struct LocalAnalyzer<'mir, 'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> { non_ssa_locals: BitSet<mir::Local>, // The location of the first visited direct assignment to each // local, or an invalid location (out of bounds `block` index). - first_assignment: IndexVec<mir::Local, Location> + first_assignment: IndexVec<mir::Local, Location>, } impl<Bx: BuilderMethods<'a, 'tcx>> LocalAnalyzer<'mir, 'a, 'tcx, Bx> { @@ -95,7 +95,8 @@ impl<Bx: BuilderMethods<'a, 'tcx>> LocalAnalyzer<'mir, 'a, 'tcx, Bx> { } impl<'mir, 'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> Visitor<'tcx> - for LocalAnalyzer<'mir, 'a, 'tcx, Bx> { + for LocalAnalyzer<'mir, 'a, 'tcx, Bx> +{ fn visit_assign(&mut self, place: &mir::Place<'tcx>, rvalue: &mir::Rvalue<'tcx>, diff --git a/src/librustc_codegen_ssa/mir/mod.rs b/src/librustc_codegen_ssa/mir/mod.rs index 78af71b5a49..c20be56ba0c 100644 --- a/src/librustc_codegen_ssa/mir/mod.rs +++ b/src/librustc_codegen_ssa/mir/mod.rs @@ -43,7 +43,7 @@ pub struct FunctionCx<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> { /// don't really care about it very much. Anyway, this value /// contains an alloca into which the personality is stored and /// then later loaded when generating the DIVERGE_BLOCK. - personality_slot: Option<PlaceRef<'tcx, Bx::Value,>>, + personality_slot: Option<PlaceRef<'tcx, Bx::Value>>, /// A `Block` for each MIR `BasicBlock` blocks: IndexVec<mir::BasicBlock, Bx::BasicBlock>, @@ -355,10 +355,11 @@ fn create_funclets<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>( mir: &'a Body<'tcx>, bx: &mut Bx, cleanup_kinds: &IndexVec<mir::BasicBlock, CleanupKind>, - block_bxs: &IndexVec<mir::BasicBlock, Bx::BasicBlock>) - -> (IndexVec<mir::BasicBlock, Option<Bx::BasicBlock>>, - IndexVec<mir::BasicBlock, Option<Bx::Funclet>>) -{ + block_bxs: &IndexVec<mir::BasicBlock, Bx::BasicBlock>, +) -> ( + IndexVec<mir::BasicBlock, Option<Bx::BasicBlock>>, + IndexVec<mir::BasicBlock, Option<Bx::Funclet>>, +) { block_bxs.iter_enumerated().zip(cleanup_kinds).map(|((bb, &llbb), cleanup_kind)| { match *cleanup_kind { CleanupKind::Funclet if base::wants_msvc_seh(bx.sess()) => {} |
