Fix rebase

diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index 14929a3772a17f5214f5a088be70c70ff6f2a003..c25a0d3b149971a78372dfd0b2451c7ad6f332d3 100644 (file)
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -263,7 +263,7 @@ fn from_def_id(tcx: TyCtxt<'_>, def_id: DefId) -> FragmentKind {
             DefKind::AssocTy => FragmentKind::AssociatedType,
             DefKind::Variant => FragmentKind::Variant,
             DefKind::Field => {
-                if tcx.def_kind(tcx.parent(def_id).unwrap()) == DefKind::Variant {
+                if tcx.def_kind(tcx.parent(def_id)) == DefKind::Variant {
                     FragmentKind::VariantField
                 } else {
                     FragmentKind::StructField
@@ -509,10 +509,7 @@ fn resolve<'path>(
                 Res::Def(
                     DefKind::AssocFn | DefKind::AssocConst | DefKind::AssocTy | DefKind::Variant,
                     def_id,
-                ) => {
-                    let parent_def_id = self.cx.tcx.parent(def_id).unwrap();
-                    (Res::from_def_id(self.cx.tcx, parent_def_id), Some(def_id))
-                }
+                ) => (Res::from_def_id(self.cx.tcx, self.cx.tcx.parent(def_id)), Some(def_id)),
                 _ => ((res, None)),
             });
         } else if ns == MacroNS {