diff options
author | Joshua Nelson <jyn514@gmail.com> | 2021-04-05 05:09:37 -0400 |
---|---|---|
committer | Joshua Nelson <jyn514@gmail.com> | 2021-04-05 14:32:13 -0400 |
commit | f4c87c58a83406207a232d8f9f00f604a6d657b7 (patch) | |
tree | 06bb6bd16f028cf2af2bc3106c83def8c97ad51b | |
parent | 58f9c5b74a77eb339d747dfead08cbafad823923 (diff) | |
download | rust-f4c87c58a83406207a232d8f9f00f604a6d657b7.tar.gz |
Take `DiagnosticInfo` in `ambiguity_error`
-rw-r--r-- | src/librustdoc/passes/collect_intra_doc_links.rs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs index e8f0c09dca4..d0ece91f014 100644 --- a/src/librustdoc/passes/collect_intra_doc_links.rs +++ b/src/librustdoc/passes/collect_intra_doc_links.rs @@ -1124,7 +1124,7 @@ impl LinkCollector<'_, '_> { } else { // `[char]` when a `char` module is in scope let candidates = vec![res, prim]; - ambiguity_error(self.cx, &item, path_str, dox, ori_link.range, candidates); + ambiguity_error(self.cx, diag_info, path_str, candidates); return None; } } @@ -1413,14 +1413,7 @@ impl LinkCollector<'_, '_> { } // If we're reporting an ambiguity, don't mention the namespaces that failed let candidates = candidates.map(|candidate| candidate.ok().map(|(res, _)| res)); - ambiguity_error( - self.cx, - diag.item, - path_str, - diag.dox, - diag.link_range, - candidates.present_items().collect(), - ); + ambiguity_error(self.cx, diag, path_str, candidates.present_items().collect()); None } } @@ -1983,10 +1976,8 @@ fn disambiguator_error( /// Report an ambiguity error, where there were multiple possible resolutions. fn ambiguity_error( cx: &DocContext<'_>, - item: &Item, + DiagnosticInfo { item, ori_link: _, dox, link_range }: DiagnosticInfo<'_>, path_str: &str, - dox: &str, - link_range: Range<usize>, candidates: Vec<Res>, ) { let mut msg = format!("`{}` is ", path_str); |