Merge branch 'rustup'

This commit is contained in:
Manish Goregaokar 2016-01-22 18:36:23 +05:30
commit 61bfaeb644
10 changed files with 20 additions and 20 deletions

View file

@ -238,7 +238,7 @@ pub fn get_trait_def_id(cx: &LateContext, path: &[&str]) -> Option<DefId> {
};
match def {
cstore::DlDef(def::DefTrait(trait_id)) => Some(trait_id),
cstore::DlDef(def::Def::Trait(trait_id)) => Some(trait_id),
_ => None,
}
}