OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issue 80559

Browse Source
This commit is contained in:
max-heller 2021-01-03 15:34:06 -05:00
parent 80184183ba
commit b4a0ef066d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,10 +394,14 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
ns,
impl_,
)
.map(|item| match item.kind {
ty::AssocKind::Fn => "method",
ty::AssocKind::Const => "associatedconstant",
ty::AssocKind::Type => "associatedtype",
.map(|item| {
let kind = item.kind;
self.kind_side_channel.set(Some((kind.as_def_kind(), item.def_id)));
match kind {
ty::AssocKind::Fn => "method",
ty::AssocKind::Const => "associatedconstant",
ty::AssocKind::Type => "associatedtype",
}
})
.map(|out| {
(
@ -1143,7 +1147,7 @@ impl LinkCollector<'_, '_> {
);
};
match res {
Res::Primitive(_) => match disambiguator {
Res::Primitive(_) if self.kind_side_channel.get().is_none() => match disambiguator {
Some(Disambiguator::Primitive | Disambiguator::Namespace(_)) | None => {
Some(ItemLink { link: ori_link.link, link_text, did: None, fragment })
}
@ -1152,6 +1156,7 @@ impl LinkCollector<'_, '_> {
None
}
},
Res::Primitive(_) => Some(ItemLink { link: ori_link, link_text, did: None, fragment }),
Res::Def(kind, id) => {
debug!("intra-doc link to {} resolved to {:?}", path_str, res);

4
src/test/rustdoc/issue-80559.rs Normal file
View File

@ -0,0 +1,4 @@
#![deny(broken_intra_doc_links)]
// Should link to https://doc.rust-lang.org/nightly/std/primitive.str.html#method.trim
// and not suggest prefixing with `prim@`
//! [str::trim()]