item -> link

diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index 2323bf8e69e6c9b09c7d9e830ce4ab3bbd9b475f..236dd792559384b792d55ebc4571aff81849529b 100644 (file)
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -819,7 +819,7 @@ fn fold_item(&mut self, mut item: Item) -> Option<Item> {
                             // The resolved item did not match the disambiguator; give a better error than 'not found'
                             let msg = format!("unresolved link to `{}`", path_str);
                             report_diagnostic(cx, &msg, &item, &dox, link_range, |diag, sp| {
-                                let msg = format!("this item resolved to {} {}, which did not match the disambiguator '{}'", kind.article(), kind.descr(id), disambiguator);
+                                let msg = format!("this link resolved to {} {}, which did not match the disambiguator '{}'", kind.article(), kind.descr(id), disambiguator);
                                 if let Some(sp) = sp {
                                     diag.span_note(sp, &msg);
                                 } else {

diff --git a/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.stderr b/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.stderr
index 21276ecb20ae9def924af526570720abdcc6928b..c40c720f879b5d2a337df653f7408147db802c87 100644 (file)
--- a/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.stderr
+++ b/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.stderr
@@ -1,5 +1,5 @@
 error: unresolved link to `S`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:16:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:14:14
    |
 LL | /// Link to [struct@S]
    |              ^^^^^^^^
@@ -9,116 +9,116 @@ note: the lint level is defined here
    |
 LL | #![deny(broken_intra_doc_links)]
    |         ^^^^^^^^^^^^^^^^^^^^^^
-note: this item resolved to an enum, which did not match the disambiguator 'struct'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:16:14
+note: this link resolved to an enum, which did not match the disambiguator 'struct'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:14:14
    |
 LL | /// Link to [struct@S]
    |              ^^^^^^^^
 
 error: unresolved link to `S`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:20:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:18:14
    |
 LL | /// Link to [mod@S]
    |              ^^^^^
    |
-note: this item resolved to an enum, which did not match the disambiguator 'mod'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:20:14
+note: this link resolved to an enum, which did not match the disambiguator 'mod'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:18:14
    |
 LL | /// Link to [mod@S]
    |              ^^^^^
 
 error: unresolved link to `S`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:24:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:22:14
    |
 LL | /// Link to [union@S]
    |              ^^^^^^^
    |
-note: this item resolved to an enum, which did not match the disambiguator 'union'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:24:14
+note: this link resolved to an enum, which did not match the disambiguator 'union'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:22:14
    |
 LL | /// Link to [union@S]
    |              ^^^^^^^
 
 error: unresolved link to `S`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:28:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:26:14
    |
 LL | /// Link to [trait@S]
    |              ^^^^^^^
    |
-note: this item resolved to an enum, which did not match the disambiguator 'trait'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:28:14
+note: this link resolved to an enum, which did not match the disambiguator 'trait'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:26:14
    |
 LL | /// Link to [trait@S]
    |              ^^^^^^^
 
 error: unresolved link to `T`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:32:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:30:14
    |
 LL | /// Link to [struct@T]
    |              ^^^^^^^^
    |
-note: this item resolved to a trait, which did not match the disambiguator 'struct'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:32:14
+note: this link resolved to a trait, which did not match the disambiguator 'struct'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:30:14
    |
 LL | /// Link to [struct@T]
    |              ^^^^^^^^
 
 error: unresolved link to `m`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:36:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:34:14
    |
 LL | /// Link to [derive@m]
    |              ^^^^^^^^
    |
-note: this item resolved to a macro, which did not match the disambiguator 'derive'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:36:14
+note: this link resolved to a macro, which did not match the disambiguator 'derive'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:34:14
    |
 LL | /// Link to [derive@m]
    |              ^^^^^^^^
 
 error: unresolved link to `s`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:40:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:38:14
    |
 LL | /// Link to [const@s]
    |              ^^^^^^^
    |
-note: this item resolved to a static, which did not match the disambiguator 'const'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:40:14
+note: this link resolved to a static, which did not match the disambiguator 'const'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:38:14
    |
 LL | /// Link to [const@s]
    |              ^^^^^^^
 
 error: unresolved link to `c`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:44:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:42:14
    |
 LL | /// Link to [static@c]
    |              ^^^^^^^^
    |
-note: this item resolved to a constant, which did not match the disambiguator 'static'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:44:14
+note: this link resolved to a constant, which did not match the disambiguator 'static'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:42:14
    |
 LL | /// Link to [static@c]
    |              ^^^^^^^^
 
 error: unresolved link to `c`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:48:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:46:14
    |
 LL | /// Link to [fn@c]
    |              ^^^^
    |
-note: this item resolved to a constant, which did not match the disambiguator 'fn'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:48:14
+note: this link resolved to a constant, which did not match the disambiguator 'fn'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:46:14
    |
 LL | /// Link to [fn@c]
    |              ^^^^
 
 error: unresolved link to `c`
-  --> $DIR/intra-links-disambiguator-mismatch.rs:52:14
+  --> $DIR/intra-links-disambiguator-mismatch.rs:50:14
    |
 LL | /// Link to [c()]
    |              ^^^
    |
-note: this item resolved to a constant, which did not match the disambiguator 'fn'
-  --> $DIR/intra-links-disambiguator-mismatch.rs:52:14
+note: this link resolved to a constant, which did not match the disambiguator 'fn'
+  --> $DIR/intra-links-disambiguator-mismatch.rs:50:14
    |
 LL | /// Link to [c()]
    |              ^^^