fix --emit=mir: StructCtors are functions

diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index 470bec975783125669dcc1ed0f5e1d708119a59a..8db4e52f3d6308cc2fd4f1cacb6d0d5bcc898e11 100644 (file)
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -375,6 +375,10 @@ pub fn describe_def(&self, node_id: NodeId) -> Option<Def> {
                 let def_id = self.local_def_id(item.id);
                 Some(Def::Const(def_id))
             }
+            Node::StructCtor(variant) => {
+                let def_id = self.local_def_id(variant.id());
+                Some(Def::Fn(def_id))
+            }
             Node::Field(_) |
             Node::Expr(_) |
             Node::Stmt(_) |
@@ -383,7 +387,6 @@ pub fn describe_def(&self, node_id: NodeId) -> Option<Def> {
             Node::TraitRef(_) |
             Node::Pat(_) |
             Node::Binding(_) |
-            Node::StructCtor(_) |
             Node::Lifetime(_) |
             Node::Visibility(_) |
             Node::Block(_) |

diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs
index 48a6fd3a95df67b6ecfa90518add2e4c085e0008..ae07aad31172f6bc03c51cdf0c358fe40689ad29 100644 (file)
--- a/src/librustc_mir/util/pretty.rs
+++ b/src/librustc_mir/util/pretty.rs
@@ -594,7 +594,7 @@ fn write_mir_sig(
 ) -> io::Result<()> {
     use rustc::hir::def::Def;
 
-    trace!("write_mir_sig: {:?} {:?}", src, tcx.hir().get_if_local(src.def_id()));
+    trace!("write_mir_sig: {:?}", src.instance);
     let descr = tcx.describe_def(src.def_id()).unwrap();
     match (descr, src.promoted) {
         (_, Some(i)) => write!(w, "{:?} in", i)?,