Merge pull request #1820 from andersk/nightly

Pass extra parameter to CrateStore::item_children for rustc nightly
This commit is contained in:
Oliver Schneider 2017-06-10 09:50:35 +02:00 committed by GitHub
commit 72ed74adfb

View File

@ -268,7 +268,7 @@ pub fn path_to_def(cx: &LateContext, path: &[&str]) -> Option<def::Def> {
krate: *krate, krate: *krate,
index: CRATE_DEF_INDEX, index: CRATE_DEF_INDEX,
}; };
let mut items = cstore.item_children(krate); let mut items = cstore.item_children(krate, cx.tcx.sess);
let mut path_it = path.iter().skip(1).peekable(); let mut path_it = path.iter().skip(1).peekable();
loop { loop {
@ -283,7 +283,7 @@ pub fn path_to_def(cx: &LateContext, path: &[&str]) -> Option<def::Def> {
return Some(item.def); return Some(item.def);
} }
items = cstore.item_children(item.def.def_id()); items = cstore.item_children(item.def.def_id(), cx.tcx.sess);
break; break;
} }
} }