mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move anchor conflict check to call site

Browse Source 
I think it makes the code easier to understand.
This commit is contained in:
Noah Lev 2022-01-05 16:50:20 -08:00
parent cfa4ac66c1
commit f89e2dd935
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/librustdoc/passes/collect_intra_doc_links.rs
View File

@ -514,7 +514,14 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
Res::Def(DefKind::AssocFn | DefKind::AssocConst, _) => assert_eq!(ns, ValueNS), Res::Def(DefKind::AssocFn | DefKind::AssocConst, _) => assert_eq!(ns, ValueNS),
Res::Def(DefKind::AssocTy, _) => assert_eq!(ns, TypeNS), Res::Def(DefKind::AssocTy, _) => assert_eq!(ns, TypeNS),
Res::Def(DefKind::Variant, _) => { Res::Def(DefKind::Variant, _) => {
return handle_variant(self.cx, res, extra_fragment); if extra_fragment.is_some() {
// NOTE: `res` can never be a primitive since this match arm means
// `tcx.def_kind(res) == DefKind::Variant`.
return Err(ErrorKind::AnchorFailure(
AnchorFailure::RustdocAnchorConflict(res),
));
}
return handle_variant(self.cx, res);
} }
// Not a trait item; just return what we found. // Not a trait item; just return what we found.
_ => return Ok((res, extra_fragment.clone())), _ => return Ok((res, extra_fragment.clone())),
@ -2272,14 +2279,9 @@ fn privacy_error(cx: &DocContext<'_>, diag_info: &DiagnosticInfo<'_>, path_str:
fn handle_variant( fn handle_variant(
cx: &DocContext<'_>, cx: &DocContext<'_>,
res: Res, res: Res,
extra_fragment: &Option<UrlFragment>,
) -> Result<(Res, Option<UrlFragment>), ErrorKind<'static>> { ) -> Result<(Res, Option<UrlFragment>), ErrorKind<'static>> {
use rustc_middle::ty::DefIdTree; use rustc_middle::ty::DefIdTree;
if extra_fragment.is_some() {
// NOTE: `res` can never be a primitive since this function is only called when `tcx.def_kind(res) == DefKind::Variant`.
return Err(ErrorKind::AnchorFailure(AnchorFailure::RustdocAnchorConflict(res)));
}
cx.tcx cx.tcx
.parent(res.def_id(cx.tcx)) .parent(res.def_id(cx.tcx))
.map(|parent| { .map(|parent| {