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

Remove unneeded argument of LinkCollector::verify_disambiguator

Browse Source
This commit is contained in:
Guillaume Gomez 2024-10-08 15:13:26 +02:00
parent 126cb9bb78
commit c9b4d1bfb1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1061,7 +1061,7 @@ fn resolve_link(
// 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 => {}
@ -1090,7 +1090,6 @@ fn resolve_link(
kind_for_dis, kind_for_dis,
id_for_dis, id_for_dis,
disambiguator, disambiguator,
item,
&diag_info, &diag_info,
)?; )?;
@ -1111,7 +1110,6 @@ fn verify_disambiguator(
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));
@ -1138,7 +1136,7 @@ fn verify_disambiguator(
// 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)