about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2020-08-04 23:39:18 -0400
committerJoshua Nelson <jyn514@gmail.com>2020-08-05 00:20:37 -0400
commitfc273a035dfb352fd90246dd2560c807701eeea7 (patch)
tree8b10f6f1cad534050d4c103d6338f2770f506af8 /src/test
parent444f5a0556fc5779663e69ff1a3d5a7362ba9618 (diff)
downloadrust-fc273a035dfb352fd90246dd2560c807701eeea7.tar.gz
rust-fc273a035dfb352fd90246dd2560c807701eeea7.zip
Unresolved link -> incompatible link kind
Clearly it has been resolved, because we say on the next line what it
resolved to.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc-ui/intra-links-disambiguator-mismatch.rs20
-rw-r--r--src/test/rustdoc-ui/intra-links-disambiguator-mismatch.stderr20
2 files changed, 20 insertions, 20 deletions
diff --git a/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.rs b/src/test/rustdoc-ui/intra-links-disambiguator-mismatch.rs
index 9bf77a53fb5..3bc08b23341 100644
--- 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
index d0a3ebf2c6a..8eb582512c0 100644
--- 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,7 +11,7 @@ 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]
@@ -19,7 +19,7 @@ LL | /// Link to [mod@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]
@@ -27,7 +27,7 @@ LL | /// Link to [union@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]
@@ -35,7 +35,7 @@ LL | /// Link to [trait@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]
@@ -43,7 +43,7 @@ LL | /// Link to [struct@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]
@@ -51,7 +51,7 @@ LL | /// Link to [derive@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]
@@ -59,7 +59,7 @@ LL | /// Link to [const@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]
@@ -67,7 +67,7 @@ LL | /// Link to [static@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]
@@ -75,7 +75,7 @@ LL | /// Link to [fn@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()]