fix rebase fallout: AnonConsts are Consts, and Methods are functions

diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index 91fc12639baf5edc8c7ed48f1a460ef3a8aa80dc..470bec975783125669dcc1ed0f5e1d708119a59a 100644 (file)
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -371,8 +371,11 @@ pub fn describe_def(&self, node_id: NodeId) -> Option<Def> {
                 let def_id = self.local_def_id(variant.node.data.id());
                 Some(Def::Variant(def_id))
             }
+            Node::AnonConst(item) => {
+                let def_id = self.local_def_id(item.id);
+                Some(Def::Const(def_id))
+            }
             Node::Field(_) |
-            Node::AnonConst(_) |
             Node::Expr(_) |
             Node::Stmt(_) |
             Node::PathSegment(_) |

diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs
index bef880ad386096e4501ae1f572b3eb6bfe8c8877..0e4cfe03bf9cef7f3e24a06ffdd2c2e76a0f6e96 100644 (file)
--- a/src/librustc_mir/util/pretty.rs
+++ b/src/librustc_mir/util/pretty.rs
@@ -575,11 +575,11 @@ fn write_mir_sig(
 ) -> io::Result<()> {
     use rustc::hir::def::Def;
 
-    debug!("write_mir_sig: {:?}", src.def_id);
+    debug!("write_mir_sig: {:?} {:?}", src.def_id, tcx.hir().get_if_local(src.def_id));
     let descr = tcx.describe_def(src.def_id).unwrap();
     match (descr, src.promoted) {
         (_, Some(i)) => write!(w, "{:?} in", i)?,
-        (Def::Fn(_), _) => write!(w, "fn")?,
+        (Def::Fn(_), _) | (Def::Method(_), _) => write!(w, "fn")?,
         (Def::Const(_), _) => write!(w, "const")?,
         (Def::Static(_, /*is_mutbl*/false), _) => write!(w, "static")?,
         (Def::Static(_, /*is_mutbl*/true), _) => write!(w, "static mut")?,
@@ -592,7 +592,7 @@ fn write_mir_sig(
     })?;
 
     match (descr, src.promoted) {
-        (Def::Fn(_), None) => {
+        (Def::Fn(_), None) | (Def::Method(_), None) => {
             write!(w, "(")?;
 
             // fn argument types.