item -> link

jyn514 · jyn514 · commit 99354f552df3 · 2020-08-03T08:39:46.000-04:00
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -819,7 +819,7 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
                             // 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
@@ -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()]
    |              ^^^

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error: unresolved link to `S`
`2`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:16:14`
	`2`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:14:14`
`3`	`3`	`\|`
`4`	`4`	`LL \| /// Link to [struct@S]`
`5`	`5`	`\| ^^^^^^^^`
`@@ -9,116 +9,116 @@ note: the lint level is defined here`
`9`	`9`	`\|`
`10`	`10`	`LL \| #![deny(broken_intra_doc_links)]`
`11`	`11`	`\| ^^^^^^^^^^^^^^^^^^^^^^`
`12`		`-note: this item resolved to an enum, which did not match the disambiguator 'struct'`
`13`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:16:14`
	`12`	`+note: this link resolved to an enum, which did not match the disambiguator 'struct'`
	`13`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:14:14`
`14`	`14`	`\|`
`15`	`15`	`LL \| /// Link to [struct@S]`
`16`	`16`	`\| ^^^^^^^^`
`17`	`17`
`18`	`18`	error: unresolved link to `S`
`19`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:20:14`
	`19`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:18:14`
`20`	`20`	`\|`
`21`	`21`	`LL \| /// Link to [mod@S]`
`22`	`22`	`\| ^^^^^`
`23`	`23`	`\|`
`24`		`-note: this item resolved to an enum, which did not match the disambiguator 'mod'`
`25`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:20:14`
	`24`	`+note: this link resolved to an enum, which did not match the disambiguator 'mod'`
	`25`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:18:14`
`26`	`26`	`\|`
`27`	`27`	`LL \| /// Link to [mod@S]`
`28`	`28`	`\| ^^^^^`
`29`	`29`
`30`	`30`	error: unresolved link to `S`
`31`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:24:14`
	`31`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:22:14`
`32`	`32`	`\|`
`33`	`33`	`LL \| /// Link to [union@S]`
`34`	`34`	`\| ^^^^^^^`
`35`	`35`	`\|`
`36`		`-note: this item resolved to an enum, which did not match the disambiguator 'union'`
`37`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:24:14`
	`36`	`+note: this link resolved to an enum, which did not match the disambiguator 'union'`
	`37`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:22:14`
`38`	`38`	`\|`
`39`	`39`	`LL \| /// Link to [union@S]`
`40`	`40`	`\| ^^^^^^^`
`41`	`41`
`42`	`42`	error: unresolved link to `S`
`43`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:28:14`
	`43`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:26:14`
`44`	`44`	`\|`
`45`	`45`	`LL \| /// Link to [trait@S]`
`46`	`46`	`\| ^^^^^^^`
`47`	`47`	`\|`
`48`		`-note: this item resolved to an enum, which did not match the disambiguator 'trait'`
`49`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:28:14`
	`48`	`+note: this link resolved to an enum, which did not match the disambiguator 'trait'`
	`49`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:26:14`
`50`	`50`	`\|`
`51`	`51`	`LL \| /// Link to [trait@S]`
`52`	`52`	`\| ^^^^^^^`
`53`	`53`
`54`	`54`	error: unresolved link to `T`
`55`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:32:14`
	`55`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:30:14`
`56`	`56`	`\|`
`57`	`57`	`LL \| /// Link to [struct@T]`
`58`	`58`	`\| ^^^^^^^^`
`59`	`59`	`\|`
`60`		`-note: this item resolved to a trait, which did not match the disambiguator 'struct'`
`61`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:32:14`
	`60`	`+note: this link resolved to a trait, which did not match the disambiguator 'struct'`
	`61`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:30:14`
`62`	`62`	`\|`
`63`	`63`	`LL \| /// Link to [struct@T]`
`64`	`64`	`\| ^^^^^^^^`
`65`	`65`
`66`	`66`	error: unresolved link to `m`
`67`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:36:14`
	`67`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:34:14`
`68`	`68`	`\|`
`69`	`69`	`LL \| /// Link to [derive@m]`
`70`	`70`	`\| ^^^^^^^^`
`71`	`71`	`\|`
`72`		`-note: this item resolved to a macro, which did not match the disambiguator 'derive'`
`73`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:36:14`
	`72`	`+note: this link resolved to a macro, which did not match the disambiguator 'derive'`
	`73`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:34:14`
`74`	`74`	`\|`
`75`	`75`	`LL \| /// Link to [derive@m]`
`76`	`76`	`\| ^^^^^^^^`
`77`	`77`
`78`	`78`	error: unresolved link to `s`
`79`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:40:14`
	`79`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:38:14`
`80`	`80`	`\|`
`81`	`81`	`LL \| /// Link to [const@s]`
`82`	`82`	`\| ^^^^^^^`
`83`	`83`	`\|`
`84`		`-note: this item resolved to a static, which did not match the disambiguator 'const'`
`85`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:40:14`
	`84`	`+note: this link resolved to a static, which did not match the disambiguator 'const'`
	`85`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:38:14`
`86`	`86`	`\|`
`87`	`87`	`LL \| /// Link to [const@s]`
`88`	`88`	`\| ^^^^^^^`
`89`	`89`
`90`	`90`	error: unresolved link to `c`
`91`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:44:14`
	`91`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:42:14`
`92`	`92`	`\|`
`93`	`93`	`LL \| /// Link to [static@c]`
`94`	`94`	`\| ^^^^^^^^`
`95`	`95`	`\|`
`96`		`-note: this item resolved to a constant, which did not match the disambiguator 'static'`
`97`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:44:14`
	`96`	`+note: this link resolved to a constant, which did not match the disambiguator 'static'`
	`97`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:42:14`
`98`	`98`	`\|`
`99`	`99`	`LL \| /// Link to [static@c]`
`100`	`100`	`\| ^^^^^^^^`
`101`	`101`
`102`	`102`	error: unresolved link to `c`
`103`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:48:14`
	`103`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:46:14`
`104`	`104`	`\|`
`105`	`105`	`LL \| /// Link to [fn@c]`
`106`	`106`	`\| ^^^^`
`107`	`107`	`\|`
`108`		`-note: this item resolved to a constant, which did not match the disambiguator 'fn'`
`109`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:48:14`
	`108`	`+note: this link resolved to a constant, which did not match the disambiguator 'fn'`
	`109`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:46:14`
`110`	`110`	`\|`
`111`	`111`	`LL \| /// Link to [fn@c]`
`112`	`112`	`\| ^^^^`
`113`	`113`
`114`	`114`	error: unresolved link to `c`
`115`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:52:14`
	`115`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:50:14`
`116`	`116`	`\|`
`117`	`117`	`LL \| /// Link to [c()]`
`118`	`118`	`\| ^^^`
`119`	`119`	`\|`
`120`		`-note: this item resolved to a constant, which did not match the disambiguator 'fn'`
`121`		`- --> $DIR/intra-links-disambiguator-mismatch.rs:52:14`
	`120`	`+note: this link resolved to a constant, which did not match the disambiguator 'fn'`
	`121`	`+ --> $DIR/intra-links-disambiguator-mismatch.rs:50:14`
`122`	`122`	`\|`
`123`	`123`	`LL \| /// Link to [c()]`
`124`	`124`	`\| ^^^`