bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #131408 - GuillaumeGomez:more-intra-doc-cleanup, r=notriddle

Browse source 
Remove unneeded argument of `LinkCollector::verify_disambiguator`

Still working on https://github.com/rust-lang/rust/pull/130278. ^^'

r? `@notriddle`
This commit is contained in:
Matthias Krüger 2024-10-08 20:13:13 +02:00 • committed by GitHub
commit cb252eef79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustdoc/passes/collect_intra_doc_links.rs
View file

@ -1073,7 +1073,7 @@ impl LinkCollector<'_, '_> {
// valid omission. See https://github.com/rust-lang/rust/pull/80660#discussion_r551585677 // valid omission. See https://github.com/rust-lang/rust/pull/80660#discussion_r551585677
// for discussion on the matter. // for discussion on the matter.
let kind = self.cx.tcx.def_kind(id); let kind = self.cx.tcx.def_kind(id);
self.verify_disambiguator(path_str, kind, id, disambiguator, item, &diag_info)?; self.verify_disambiguator(path_str, kind, id, disambiguator, &diag_info)?;
} else { } else {
match disambiguator { match disambiguator {
Some(Disambiguator::Primitive | Disambiguator::Namespace(_)) | None => {} Some(Disambiguator::Primitive | Disambiguator::Namespace(_)) | None => {}
@ -1102,7 +1102,6 @@ impl LinkCollector<'_, '_> {
kind_for_dis, kind_for_dis,
id_for_dis, id_for_dis,
disambiguator, disambiguator,
item,
&diag_info, &diag_info,
)?; )?;
@ -1123,7 +1122,6 @@ impl LinkCollector<'_, '_> {
kind: DefKind, kind: DefKind,
id: DefId, id: DefId,
disambiguator: Option<Disambiguator>, disambiguator: Option<Disambiguator>,
item: &Item,
diag_info: &DiagnosticInfo<'_>, diag_info: &DiagnosticInfo<'_>,
) -> Option<()> { ) -> Option<()> {
debug!("intra-doc link to {path_str} resolved to {:?}", (kind, id)); debug!("intra-doc link to {path_str} resolved to {:?}", (kind, id));
@ -1150,7 +1148,7 @@ impl LinkCollector<'_, '_> {
// item can be non-local e.g. when using `#[rustc_doc_primitive = "pointer"]` // item can be non-local e.g. when using `#[rustc_doc_primitive = "pointer"]`
if let Some((src_id, dst_id)) = id.as_local().and_then(|dst_id| { if let Some((src_id, dst_id)) = id.as_local().and_then(|dst_id| {
item.item_id.expect_def_id().as_local().map(|src_id| (src_id, dst_id)) diag_info.item.item_id.expect_def_id().as_local().map(|src_id| (src_id, dst_id))
}) { }) {
if self.cx.tcx.effective_visibilities(()).is_exported(src_id) if self.cx.tcx.effective_visibilities(()).is_exported(src_id)
&& !self.cx.tcx.effective_visibilities(()).is_exported(dst_id) && !self.cx.tcx.effective_visibilities(()).is_exported(dst_id)