Skip to content

Commit

Permalink
Showing 3 changed files with 40 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/librustc_metadata/decoder.rs
Original file line number Diff line number Diff line change
@@ -977,7 +977,13 @@ impl<'a, 'tcx> CrateMetadata {
}

pub fn get_trait_of_item(&self, id: DefIndex) -> Option<DefId> {
self.def_key(id).parent.and_then(|parent_index| {
let def_key = self.def_key(id);
match def_key.disambiguated_data.data {
DefPathData::TypeNs(..) | DefPathData::ValueNs(..) => (),
// Not an associated item
_ => return None,
}
def_key.parent.and_then(|parent_index| {
match self.entry(parent_index).kind {
EntryKind::Trait(_) => Some(self.local_def_id(parent_index)),
_ => None,
16 changes: 16 additions & 0 deletions src/test/run-pass/auxiliary/issue-48984-aux.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2018 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.

#![crate_type = "lib"]
#![crate_name = "issue48984aux"]

pub trait Foo { type Item; }

pub trait Bar: Foo<Item=[u8;1]> { }
17 changes: 17 additions & 0 deletions src/test/run-pass/issue-48984.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2018 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:issue-48984-aux.rs
extern crate issue48984aux;
use issue48984aux::Bar;

fn do_thing<T: Bar>() { }

fn main() { }

0 comments on commit f76f6fb

Please sign in to comment.