diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2016-03-23 04:19:16 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2016-03-23 16:42:53 -0400 |
| commit | 14a5657a9a22580aecdbcd72fdea35e4c30f36a5 (patch) | |
| tree | 95fc452de82e9a06ea3cb0aa5bc4b833f5de784a /src | |
| parent | f66fd8972f16f7a38f57c9953f1f6972a917c905 (diff) | |
| download | rust-14a5657a9a22580aecdbcd72fdea35e4c30f36a5.tar.gz rust-14a5657a9a22580aecdbcd72fdea35e4c30f36a5.zip | |
Rename `MirPlusPlus` to `MirAndScopeAuxiliary`
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/build/mod.rs | 6 | ||||
| -rw-r--r-- | src/librustc_mir/mir_map.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_mir/build/mod.rs b/src/librustc_mir/build/mod.rs index d52d750b12c..58b2b92b796 100644 --- a/src/librustc_mir/build/mod.rs +++ b/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, diff --git a/src/librustc_mir/mir_map.rs b/src/librustc_mir/mir_map.rs index 242d2506c82..276f7d0f46a 100644 --- a/src/librustc_mir/mir_map.rs +++ b/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, |