Auto merge of #37095 - petrochenkov:metactor, r=alexcrichton

bors · web-flow · commit a29c49f5cca8 · 2016-10-11T23:36:29.000-07:00
Temporary fix for metadata decoding for struct constructors Same as #37078, but for nightly. Ideally, metadata lookup functions should "just work" for constructor ids, but this fixes the issue as well. Fixes #37026 r? @alexcrichton
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
@@ -2323,7 +2323,11 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
                 let enum_did = self.parent_def_id(did).unwrap();
                 self.lookup_adt_def(enum_did).variant_with_id(did)
             }
-            Def::Struct(did) | Def::StructCtor(did, ..) | Def::Union(did) => {
+            Def::Struct(did) | Def::Union(did) => {
+                self.lookup_adt_def(did).struct_variant()
+            }
+            Def::StructCtor(ctor_did, ..) => {
+                let did = self.parent_def_id(ctor_did).expect("struct ctor has no parent");
                 self.lookup_adt_def(did).struct_variant()
             }
             _ => bug!("expect_variant_def used with unexpected def {:?}", def)
diff --git a/src/test/compile-fail/issue-37026.rs b/src/test/compile-fail/issue-37026.rs
@@ -0,0 +1,18 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// aux-build:empty-struct.rs
+
+extern crate empty_struct;
+
+fn main() {
+    let empty_struct::XEmpty2 = (); //~ ERROR mismatched types
+    let empty_struct::XEmpty6(..) = (); //~ ERROR mismatched types
+}

Original file line number	Diff line number	Diff line change
`@@ -2323,7 +2323,11 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {`
`2323`	`2323`	`let enum_did = self.parent_def_id(did).unwrap();`
`2324`	`2324`	`self.lookup_adt_def(enum_did).variant_with_id(did)`
`2325`	`2325`	`}`
`2326`		`- Def::Struct(did) \| Def::StructCtor(did, ..) \| Def::Union(did) => {`
	`2326`	`+ Def::Struct(did) \| Def::Union(did) => {`
	`2327`	`+ self.lookup_adt_def(did).struct_variant()`
	`2328`	`+ }`
	`2329`	`+ Def::StructCtor(ctor_did, ..) => {`
	`2330`	`+ let did = self.parent_def_id(ctor_did).expect("struct ctor has no parent");`
`2327`	`2331`	`self.lookup_adt_def(did).struct_variant()`
`2328`	`2332`	`}`
`2329`	`2333`	`_ => bug!("expect_variant_def used with unexpected def {:?}", def)`