diff options
| author | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2017-05-25 21:07:30 +0000 |
|---|---|---|
| committer | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2017-05-25 21:07:45 +0000 |
| commit | dc34ea092976ab9a87e68f1b255b4afbe31a9475 (patch) | |
| tree | cb0aa7938c2695e6b2cfef2fb7693261a3c28f9f | |
| parent | d940d543df812ef4b2b3378db2315365f7a62836 (diff) | |
| download | rust-dc34ea092976ab9a87e68f1b255b4afbe31a9475.tar.gz rust-dc34ea092976ab9a87e68f1b255b4afbe31a9475.zip | |
Fix merge conflicts.
| -rw-r--r-- | src/librustdoc/clean/inline.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index 141efe471af..5ea3eaa88d7 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -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) } } |