1
Fork 0

Fix merge conflicts.

This commit is contained in:
Jeffrey Seyfried 2017-05-25 21:07:30 +00:00
parent d940d543df
commit dc34ea0929

View file

@ -447,7 +447,7 @@ fn build_module(cx: &DocContext, did: DefId) -> clean::Module {
let def_id = item.def.def_id();
if cx.tcx.sess.cstore.visibility(def_id) == ty::Visibility::Public {
if !visited.insert(def_id) { continue }
if let Some(i) = try_inline(cx, item.def, item.name) {
if let Some(i) = try_inline(cx, item.def, item.ident.name) {
items.extend(i)
}
}