languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-01 14:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for metadata decoding for struct constructors

Browse source
This commit is contained in:
Vadim Petrochenkov 2016-10-11 23:04:29 +03:00
parent e33562078f
commit f5827d08d9
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/librustc/ty/mod.rs
View file

@ -2323,7 +2323,11 @@ pub fn expect_variant_def(self, def: Def) -> VariantDef<'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)

18
src/test/compile-fail/issue-37026.rs Normal file
View file

@ -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
}