mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #56616 - estebank:issue-56539, r=davidtwco

Browse Source 
Encode `TraitAlias` as if they were `Trait`

Fix #56539.
This commit is contained in:
bors 2018-12-08 19:34:43 +00:00
commit 8db23425a3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_metadata/encoder.rs
View File

@ -1141,7 +1141,8 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
EntryKind::Impl(self.lazy(&data)) EntryKind::Impl(self.lazy(&data))
} }
hir::ItemKind::Trait(..) => { hir::ItemKind::Trait(..) |
hir::ItemKind::TraitAlias(..) => {
let trait_def = tcx.trait_def(def_id); let trait_def = tcx.trait_def(def_id);
let data = TraitData { let data = TraitData {
unsafety: trait_def.unsafety, unsafety: trait_def.unsafety,
@ -1154,7 +1155,6 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
EntryKind::Trait(self.lazy(&data)) EntryKind::Trait(self.lazy(&data))
} }
hir::ItemKind::ExternCrate(_) | hir::ItemKind::ExternCrate(_) |
hir::ItemKind::TraitAlias(..) |
hir::ItemKind::Use(..) => bug!("cannot encode info for item {:?}", item), hir::ItemKind::Use(..) => bug!("cannot encode info for item {:?}", item),
}; };

7
src/test/ui/run-pass/traits/trait-alias.rs Normal file
View File

@ -0,0 +1,7 @@
// run-pass
#![feature(trait_alias)]
pub trait Foo {}
pub trait FooAlias = Foo;
fn main() {}