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

Rollup merge of #109534 - petrochenkov:noprimuse, r=GuillaumeGomez

Browse Source 
rustdoc: Unsupport importing `doc(primitive)` and `doc(keyword)` modules

These are internal features used for a specific purpose, and modules without imports are enough for that purpose.
This commit is contained in:
Dylan DPC 2023-03-29 14:07:27 +05:30 committed by GitHub
commit 1db9eae033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/librustdoc/clean/types.rs
View File

@ -232,14 +232,6 @@ pub(crate) fn keywords(&self, tcx: TyCtxt<'_>) -> ThinVec<(DefId, Symbol)> {
hir::ItemKind::Mod(_) => { hir::ItemKind::Mod(_) => {
as_keyword(Res::Def(DefKind::Mod, id.owner_id.to_def_id())) as_keyword(Res::Def(DefKind::Mod, id.owner_id.to_def_id()))
} }
hir::ItemKind::Use(path, hir::UseKind::Single)
if tcx.visibility(id.owner_id).is_public() =>
{
path.res
.iter()
.find_map(|res| as_keyword(res.expect_non_local()))
.map(|(_, prim)| (id.owner_id.to_def_id(), prim))
}
_ => None, _ => None,
} }
}) })
@ -302,15 +294,6 @@ pub(crate) fn primitives(&self, tcx: TyCtxt<'_>) -> ThinVec<(DefId, PrimitiveTyp
hir::ItemKind::Mod(_) => { hir::ItemKind::Mod(_) => {
as_primitive(Res::Def(DefKind::Mod, id.owner_id.to_def_id())) as_primitive(Res::Def(DefKind::Mod, id.owner_id.to_def_id()))
} }
hir::ItemKind::Use(path, hir::UseKind::Single)
if tcx.visibility(id.owner_id).is_public() =>
{
path.res
.iter()
.find_map(|res| as_primitive(res.expect_non_local()))
// Pretend the primitive is local.
.map(|(_, prim)| (id.owner_id.to_def_id(), prim))
}
_ => None, _ => None,
} }
}) })

2
tests/rustdoc/issue-15318-2.rs
View File

@ -6,7 +6,7 @@
pub use issue_15318::ptr; pub use issue_15318::ptr;
// @has issue_15318_2/fn.bar.html \ // @!has issue_15318_2/fn.bar.html \
// '//*[@href="primitive.pointer.html"]' \ // '//*[@href="primitive.pointer.html"]' \
// '*mut T' // '*mut T'
pub fn bar<T>(ptr: *mut T) {} pub fn bar<T>(ptr: *mut T) {}