Rename `MirPlusPlus` to `MirAndScopeAuxiliary`

src/librustc_mir/build/mod.rs

@@ -85,7 +85,7 @@ pub struct Location {
     pub statement_index: usize,
 }
 
-pub struct MirPlusPlus<'tcx> {
+pub struct MirAndScopeAuxiliary<'tcx> {
     pub mir: Mir<'tcx>,
     pub scope_auxiliary: Vec<ScopeAuxiliary>,
 }
@@ -143,7 +143,7 @@ pub fn construct<'a,'tcx>(hir: Cx<'a,'tcx>,
                           argument_extent: CodeExtent,
                           return_ty: FnOutput<'tcx>,
                           ast_block: &'tcx hir::Block)
-                          -> MirPlusPlus<'tcx> {
+                          -> MirAndScopeAuxiliary<'tcx> {
     let cfg = CFG { basic_blocks: vec![] };
 
     let mut builder = Builder {
@@ -188,7 +188,7 @@ pub fn construct<'a,'tcx>(hir: Cx<'a,'tcx>,
                        true
                    }));
 
-    MirPlusPlus {
+    MirAndScopeAuxiliary {
         mir: Mir {
             basic_blocks: builder.cfg.basic_blocks,
             scopes: builder.scope_data_vec,

src/librustc_mir/mir_map.rs

@@ -19,7 +19,7 @@
 extern crate syntax;
 extern crate rustc_front;
 
-use build::{self, MirPlusPlus};
+use build::{self, MirAndScopeAuxiliary};
 use rustc::dep_graph::DepNode;
 use rustc::mir::repr::Mir;
 use pretty;
@@ -183,7 +183,7 @@ fn build_mir<'a,'tcx:'a>(cx: Cx<'a,'tcx>,
     let parameter_scope =
         cx.tcx().region_maps.lookup_code_extent(
             CodeExtentData::ParameterScope { fn_id: fn_id, body_id: body.id });
-    let MirPlusPlus { mut mir, scope_auxiliary } =
+    let MirAndScopeAuxiliary { mut mir, scope_auxiliary } =
         build::construct(cx,
                          span,
                          implicit_arg_tys,