diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2022-05-02 23:10:51 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2022-05-13 20:42:53 +0300 |
| commit | 6c5c7f503eb476f7e2004abca9669c4715a9b275 (patch) | |
| tree | f0c1df49cc475bc699164e27129ee3d4bbfb5a32 | |
| parent | a9c14dc440aaf096cd4d69ede55799383b0f0a1e (diff) | |
| download | rust-6c5c7f503eb476f7e2004abca9669c4715a9b275.tar.gz rust-6c5c7f503eb476f7e2004abca9669c4715a9b275.zip | |
Fix rebase
| -rw-r--r-- | src/librustdoc/passes/collect_intra_doc_links.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs index 14929a3772a..c25a0d3b149 100644 --- a/src/librustdoc/passes/collect_intra_doc_links.rs +++ b/src/librustdoc/passes/collect_intra_doc_links.rs @@ -263,7 +263,7 @@ impl 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 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> { 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 { |