diff options
| author | Ralf Jung <post@ralfj.de> | 2019-02-03 14:09:56 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2019-02-09 12:11:12 +0100 |
| commit | 27ce224a8f84d8ed2fdb01410d7b931fd29655c1 (patch) | |
| tree | d488989922f373b606e3ac57201a1398fe57554d /src | |
| parent | fed4c5d9e13e7cde3399336342a64ba23308d4f5 (diff) | |
| download | rust-27ce224a8f84d8ed2fdb01410d7b931fd29655c1.tar.gz rust-27ce224a8f84d8ed2fdb01410d7b931fd29655c1.zip | |
fix --emit=mir: StructCtors are functions
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/hir/map/mod.rs | 5 | ||||
| -rw-r--r-- | src/librustc_mir/util/pretty.rs | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs index 470bec97578..8db4e52f3d6 100644 --- a/src/librustc/hir/map/mod.rs +++ b/src/librustc/hir/map/mod.rs @@ -375,6 +375,10 @@ impl<'hir> Map<'hir> { 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 @@ impl<'hir> Map<'hir> { 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 48a6fd3a95d..ae07aad3117 100644 --- 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)?, |