Unresolved link -> incompatible link kind

jyn514 · jyn514 · commit fc273a035dfb · 2020-08-05T00:20:37.000-04:00
Clearly it has been resolved, because we say on the next line what it
resolved to.
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -777,7 +777,7 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
                         (_, Some(Disambiguator::Kind(expected))) if kind == expected => {}
                         (_, Some(expected)) => {
                             // The resolved item did not match the disambiguator; give a better error than 'not found'
-                            let msg = format!("unresolved link to `{}`", path_str);
+                            let msg = format!("incompatible link kind for `{}`", path_str);
                             report_diagnostic(cx, &msg, &item, &dox, link_range, |diag, sp| {
                                 // HACK(jynelson): by looking at the source I saw the DefId we pass
                                 // for `expected.descr()` doesn't matter, since it's not a crate
@@ -787,7 +787,6 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
                                 diag.note(&note);
                                 if let Some(sp) = sp {
                                     diag.span_suggestion(sp, &help_msg, suggestion, Applicability::MaybeIncorrect);
-                                    diag.set_sort_span(sp);
                                 }
                             });
                             continue;
diff --git a/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.rs b/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.rs
@@ -12,52 +12,52 @@ const c: usize = 0;
 trait T {}
 
 /// Link to [struct@S]
-//~^ ERROR unresolved link to `S`
+//~^ ERROR incompatible link kind for `S`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 
 /// Link to [mod@S]
-//~^ ERROR unresolved link to `S`
+//~^ ERROR incompatible link kind for `S`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 
 /// Link to [union@S]
-//~^ ERROR unresolved link to `S`
+//~^ ERROR incompatible link kind for `S`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 
 /// Link to [trait@S]
-//~^ ERROR unresolved link to `S`
+//~^ ERROR incompatible link kind for `S`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 
 /// Link to [struct@T]
-//~^ ERROR unresolved link to `T`
+//~^ ERROR incompatible link kind for `T`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 
 /// Link to [derive@m]
-//~^ ERROR unresolved link to `m`
+//~^ ERROR incompatible link kind for `m`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 
 /// Link to [const@s]
-//~^ ERROR unresolved link to `s`
+//~^ ERROR incompatible link kind for `s`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 
 /// Link to [static@c]
-//~^ ERROR unresolved link to `c`
+//~^ ERROR incompatible link kind for `c`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 
 /// Link to [fn@c]
-//~^ ERROR unresolved link to `c`
+//~^ ERROR incompatible link kind for `c`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 
 /// Link to [c()]
-//~^ ERROR unresolved link to `c`
+//~^ ERROR incompatible link kind for `c`
 //~| NOTE this link resolved
 //~| HELP use its disambiguator
 pub fn f() {}
diff --git a/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.stderr b/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.stderr
@@ -1,4 +1,4 @@
-error: unresolved link to `S`
+error: incompatible link kind for `S`
   --> $DIR/intra-links-disambiguator-mismatch.rs:14:14
    |
 LL | /// Link to [struct@S]
@@ -11,71 +11,71 @@ LL | #![deny(broken_intra_doc_links)]
    |         ^^^^^^^^^^^^^^^^^^^^^^
    = note: this link resolved to an enum, which is not a struct
 
-error: unresolved link to `S`
+error: incompatible link kind for `S`
   --> $DIR/intra-links-disambiguator-mismatch.rs:19:14
    |
 LL | /// Link to [mod@S]
    |              ^^^^^ help: to link to the enum, use its disambiguator: `enum@S`
    |
    = note: this link resolved to an enum, which is not a module
 
-error: unresolved link to `S`
+error: incompatible link kind for `S`
   --> $DIR/intra-links-disambiguator-mismatch.rs:24:14
    |
 LL | /// Link to [union@S]
    |              ^^^^^^^ help: to link to the enum, use its disambiguator: `enum@S`
    |
    = note: this link resolved to an enum, which is not a union
 
-error: unresolved link to `S`
+error: incompatible link kind for `S`
   --> $DIR/intra-links-disambiguator-mismatch.rs:29:14
    |
 LL | /// Link to [trait@S]
    |              ^^^^^^^ help: to link to the enum, use its disambiguator: `enum@S`
    |
    = note: this link resolved to an enum, which is not a trait
 
-error: unresolved link to `T`
+error: incompatible link kind for `T`
   --> $DIR/intra-links-disambiguator-mismatch.rs:34:14
    |
 LL | /// Link to [struct@T]
    |              ^^^^^^^^ help: to link to the trait, use its disambiguator: `trait@T`
    |
    = note: this link resolved to a trait, which is not a struct
 
-error: unresolved link to `m`
+error: incompatible link kind for `m`
   --> $DIR/intra-links-disambiguator-mismatch.rs:39:14
    |
 LL | /// Link to [derive@m]
    |              ^^^^^^^^ help: to link to the macro, use its disambiguator: `m!`
    |
    = note: this link resolved to a macro, which is not a derive macro
 
-error: unresolved link to `s`
+error: incompatible link kind for `s`
   --> $DIR/intra-links-disambiguator-mismatch.rs:44:14
    |
 LL | /// Link to [const@s]
    |              ^^^^^^^ help: to link to the static, use its disambiguator: `static@s`
    |
    = note: this link resolved to a static, which is not a constant
 
-error: unresolved link to `c`
+error: incompatible link kind for `c`
   --> $DIR/intra-links-disambiguator-mismatch.rs:49:14
    |
 LL | /// Link to [static@c]
    |              ^^^^^^^^ help: to link to the constant, use its disambiguator: `const@c`
    |
    = note: this link resolved to a constant, which is not a static
 
-error: unresolved link to `c`
+error: incompatible link kind for `c`
   --> $DIR/intra-links-disambiguator-mismatch.rs:54:14
    |
 LL | /// Link to [fn@c]
    |              ^^^^ help: to link to the constant, use its disambiguator: `const@c`
    |
    = note: this link resolved to a constant, which is not a function
 
-error: unresolved link to `c`
+error: incompatible link kind for `c`
   --> $DIR/intra-links-disambiguator-mismatch.rs:59:14
    |
 LL | /// Link to [c()]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error: unresolved link to `S`
	`1`	+error: incompatible link kind for `S`
`2`	`2`	`--> $DIR/intra-links-disambiguator-mismatch.rs:14:14`
`3`	`3`	`\|`
`4`	`4`	`LL \| /// Link to [struct@S]`
`@@ -11,71 +11,71 @@ LL \| #![deny(broken_intra_doc_links)]`
`11`	`11`	`\| ^^^^^^^^^^^^^^^^^^^^^^`
`12`	`12`	`= note: this link resolved to an enum, which is not a struct`
`13`	`13`
`14`		-error: unresolved link to `S`
	`14`	+error: incompatible link kind for `S`
`15`	`15`	`--> $DIR/intra-links-disambiguator-mismatch.rs:19:14`
`16`	`16`	`\|`
`17`	`17`	`LL \| /// Link to [mod@S]`
`18`	`18`	\| ^^^^^ help: to link to the enum, use its disambiguator: `enum@S`
`19`	`19`	`\|`
`20`	`20`	`= note: this link resolved to an enum, which is not a module`
`21`	`21`
`22`		-error: unresolved link to `S`
	`22`	+error: incompatible link kind for `S`
`23`	`23`	`--> $DIR/intra-links-disambiguator-mismatch.rs:24:14`
`24`	`24`	`\|`
`25`	`25`	`LL \| /// Link to [union@S]`
`26`	`26`	\| ^^^^^^^ help: to link to the enum, use its disambiguator: `enum@S`
`27`	`27`	`\|`
`28`	`28`	`= note: this link resolved to an enum, which is not a union`
`29`	`29`
`30`		-error: unresolved link to `S`
	`30`	+error: incompatible link kind for `S`
`31`	`31`	`--> $DIR/intra-links-disambiguator-mismatch.rs:29:14`
`32`	`32`	`\|`
`33`	`33`	`LL \| /// Link to [trait@S]`
`34`	`34`	\| ^^^^^^^ help: to link to the enum, use its disambiguator: `enum@S`
`35`	`35`	`\|`
`36`	`36`	`= note: this link resolved to an enum, which is not a trait`
`37`	`37`
`38`		-error: unresolved link to `T`
	`38`	+error: incompatible link kind for `T`
`39`	`39`	`--> $DIR/intra-links-disambiguator-mismatch.rs:34:14`
`40`	`40`	`\|`
`41`	`41`	`LL \| /// Link to [struct@T]`
`42`	`42`	\| ^^^^^^^^ help: to link to the trait, use its disambiguator: `trait@T`
`43`	`43`	`\|`
`44`	`44`	`= note: this link resolved to a trait, which is not a struct`
`45`	`45`
`46`		-error: unresolved link to `m`
	`46`	+error: incompatible link kind for `m`
`47`	`47`	`--> $DIR/intra-links-disambiguator-mismatch.rs:39:14`
`48`	`48`	`\|`
`49`	`49`	`LL \| /// Link to [derive@m]`
`50`	`50`	\| ^^^^^^^^ help: to link to the macro, use its disambiguator: `m!`
`51`	`51`	`\|`
`52`	`52`	`= note: this link resolved to a macro, which is not a derive macro`
`53`	`53`
`54`		-error: unresolved link to `s`
	`54`	+error: incompatible link kind for `s`
`55`	`55`	`--> $DIR/intra-links-disambiguator-mismatch.rs:44:14`
`56`	`56`	`\|`
`57`	`57`	`LL \| /// Link to [const@s]`
`58`	`58`	\| ^^^^^^^ help: to link to the static, use its disambiguator: `static@s`
`59`	`59`	`\|`
`60`	`60`	`= note: this link resolved to a static, which is not a constant`
`61`	`61`
`62`		-error: unresolved link to `c`
	`62`	+error: incompatible link kind for `c`
`63`	`63`	`--> $DIR/intra-links-disambiguator-mismatch.rs:49:14`
`64`	`64`	`\|`
`65`	`65`	`LL \| /// Link to [static@c]`
`66`	`66`	\| ^^^^^^^^ help: to link to the constant, use its disambiguator: `const@c`
`67`	`67`	`\|`
`68`	`68`	`= note: this link resolved to a constant, which is not a static`
`69`	`69`
`70`		-error: unresolved link to `c`
	`70`	+error: incompatible link kind for `c`
`71`	`71`	`--> $DIR/intra-links-disambiguator-mismatch.rs:54:14`
`72`	`72`	`\|`
`73`	`73`	`LL \| /// Link to [fn@c]`
`74`	`74`	\| ^^^^ help: to link to the constant, use its disambiguator: `const@c`
`75`	`75`	`\|`
`76`	`76`	`= note: this link resolved to a constant, which is not a function`
`77`	`77`
`78`		-error: unresolved link to `c`
	`78`	+error: incompatible link kind for `c`
`79`	`79`	`--> $DIR/intra-links-disambiguator-mismatch.rs:59:14`
`80`	`80`	`\|`
`81`	`81`	`LL \| /// Link to [c()]`