Fix merge conflicts.

jseyfried · jseyfried · commit dc34ea092976 · 2017-05-25T21:07:45.000Z
diff --git 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)
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ fn build_module(cx: &DocContext, did: DefId) -> clean::Module {`
`447`	`447`	`let def_id = item.def.def_id();`
`448`	`448`	`if cx.tcx.sess.cstore.visibility(def_id) == ty::Visibility::Public {`
`449`	`449`	`if !visited.insert(def_id) { continue }`
`450`		`- if let Some(i) = try_inline(cx, item.def, item.name) {`
	`450`	`+ if let Some(i) = try_inline(cx, item.def, item.ident.name) {`
`451`	`451`	`items.extend(i)`
`452`	`452`	`}`
`453`	`453`	`}`