Fix MIR unpretty on failure conditions

rust-lang · Feb 27, 2016 · 1bad5d1 · 1bad5d1
1 parent f6f050d
commit 1bad5d1
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs
@@ -817,13 +817,12 @@ pub fn pretty_print_input(sess: Session,
                                                              &id,
                                                              resolve::MakeGlobMap::No,
                                                              |tcx, mir_map, _, _| {
-                let mir_map = mir_map.unwrap();
-
-                for (nodeid, mir) in &mir_map.map {
-                    try!(writeln!(out, "MIR for {}", tcx.map.node_to_string(*nodeid)));
-                    try!(write_mir_pretty(mir, &mut out));
+                if let Some(mir_map) = mir_map {
+                    for (nodeid, mir) in &mir_map.map {
+                        try!(writeln!(out, "MIR for {}", tcx.map.node_to_string(*nodeid)));
+                        try!(write_mir_pretty(mir, &mut out));
+                    }
                 }
-
                 Ok(())
             }), &sess)
         }
@@ -840,12 +839,14 @@ pub fn pretty_print_input(sess: Session,
                                                              &id,
                                                              resolve::MakeGlobMap::No,
                                                              |tcx, mir_map, _, _| {
-                let mir_map = mir_map.unwrap();
-                try!(writeln!(out, "MIR for {}", tcx.map.node_to_string(nodeid)));
-                let mir = mir_map.map.get(&nodeid).unwrap_or_else(|| {
-                    sess.fatal(&format!("no MIR map entry for node {}", nodeid))
-                });
-                write_mir_pretty(mir, &mut out)
+                if let Some(mir_map) = mir_map {
+                    try!(writeln!(out, "MIR for {}", tcx.map.node_to_string(nodeid)));
+                    let mir = mir_map.map.get(&nodeid).unwrap_or_else(|| {
+                        sess.fatal(&format!("no MIR map entry for node {}", nodeid))
+                    });
+                    try!(write_mir_pretty(mir, &mut out));
+                }
+                Ok(())
             }), &sess)
         }