summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2021-04-05 05:15:57 -0400
committerJoshua Nelson <jyn514@gmail.com>2021-04-05 14:32:13 -0400
commit661acbc8bc9f9f0669e27c8af37faf4effff7c53 (patch)
tree5a0f6579cfb17c379fda0145de3b6841ce0b7c72
parentf4c87c58a83406207a232d8f9f00f604a6d657b7 (diff)
downloadrust-661acbc8bc9f9f0669e27c8af37faf4effff7c53.tar.gz
Take DiagnosticInfo in privacy_error
-rw-r--r--src/librustdoc/passes/collect_intra_doc_links.rs10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index d0ece91f014..59981a2f852 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -1192,7 +1192,7 @@ impl LinkCollector<'_, '_> {
if self.cx.tcx.privacy_access_levels(LOCAL_CRATE).is_exported(hir_src)
&& !self.cx.tcx.privacy_access_levels(LOCAL_CRATE).is_exported(hir_dst)
{
- privacy_error(self.cx, &item, &path_str, dox, &ori_link);
+ privacy_error(self.cx, diag_info, &path_str);
}
}
@@ -2045,7 +2045,11 @@ fn suggest_disambiguator(
}
/// Report a link from a public item to a private one.
-fn privacy_error(cx: &DocContext<'_>, item: &Item, path_str: &str, dox: &str, link: &MarkdownLink) {
+fn privacy_error(
+ cx: &DocContext<'_>,
+ DiagnosticInfo { item, ori_link: _, dox, link_range }: DiagnosticInfo<'_>,
+ path_str: &str,
+) {
let sym;
let item_name = match item.name {
Some(name) => {
@@ -2057,7 +2061,7 @@ fn privacy_error(cx: &DocContext<'_>, item: &Item, path_str: &str, dox: &str, li
let msg =
format!("public documentation for `{}` links to private item `{}`", item_name, path_str);
- report_diagnostic(cx.tcx, PRIVATE_INTRA_DOC_LINKS, &msg, item, dox, &link.range, |diag, sp| {
+ report_diagnostic(cx.tcx, PRIVATE_INTRA_DOC_LINKS, &msg, item, dox, &link_range, |diag, sp| {
if let Some(sp) = sp {
diag.span_label(sp, "this item is private");
}