Skip to content

Commit fc273a0

Browse files
jyn514jyn514
committed
Unresolved link -> incompatible link kind
Clearly it has been resolved, because we say on the next line what it resolved to.
1 parent 444f5a0 commit fc273a0

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

‎src/librustdoc/passes/collect_intra_doc_links.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
777777
(_, Some(Disambiguator::Kind(expected))) if kind == expected => {}
778778
(_, Some(expected)) => {
779779
// The resolved item did not match the disambiguator; give a better error than 'not found'
780-
let msg = format!("unresolved link to `{}`", path_str);
780+
let msg = format!("incompatible link kind for `{}`", path_str);
781781
report_diagnostic(cx, &msg, &item, &dox, link_range, |diag, sp| {
782782
// HACK(jynelson): by looking at the source I saw the DefId we pass
783783
// for `expected.descr()` doesn't matter, since it's not a crate
@@ -787,7 +787,6 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
787787
diag.note(&note);
788788
if let Some(sp) = sp {
789789
diag.span_suggestion(sp, &help_msg, suggestion, Applicability::MaybeIncorrect);
790-
diag.set_sort_span(sp);
791790
}
792791
});
793792
continue;

‎src/test/rustdoc-ui/intra-links-disambiguator-mismatch.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,52 +12,52 @@ const c: usize = 0;
1212
trait T {}
1313

1414
/// Link to [struct@S]
15-
//~^ ERROR unresolved link to `S`
15+
//~^ ERROR incompatible link kind for `S`
1616
//~| NOTE this link resolved
1717
//~| HELP use its disambiguator
1818

1919
/// Link to [mod@S]
20-
//~^ ERROR unresolved link to `S`
20+
//~^ ERROR incompatible link kind for `S`
2121
//~| NOTE this link resolved
2222
//~| HELP use its disambiguator
2323

2424
/// Link to [union@S]
25-
//~^ ERROR unresolved link to `S`
25+
//~^ ERROR incompatible link kind for `S`
2626
//~| NOTE this link resolved
2727
//~| HELP use its disambiguator
2828

2929
/// Link to [trait@S]
30-
//~^ ERROR unresolved link to `S`
30+
//~^ ERROR incompatible link kind for `S`
3131
//~| NOTE this link resolved
3232
//~| HELP use its disambiguator
3333

3434
/// Link to [struct@T]
35-
//~^ ERROR unresolved link to `T`
35+
//~^ ERROR incompatible link kind for `T`
3636
//~| NOTE this link resolved
3737
//~| HELP use its disambiguator
3838

3939
/// Link to [derive@m]
40-
//~^ ERROR unresolved link to `m`
40+
//~^ ERROR incompatible link kind for `m`
4141
//~| NOTE this link resolved
4242
//~| HELP use its disambiguator
4343

4444
/// Link to [const@s]
45-
//~^ ERROR unresolved link to `s`
45+
//~^ ERROR incompatible link kind for `s`
4646
//~| NOTE this link resolved
4747
//~| HELP use its disambiguator
4848

4949
/// Link to [static@c]
50-
//~^ ERROR unresolved link to `c`
50+
//~^ ERROR incompatible link kind for `c`
5151
//~| NOTE this link resolved
5252
//~| HELP use its disambiguator
5353

5454
/// Link to [fn@c]
55-
//~^ ERROR unresolved link to `c`
55+
//~^ ERROR incompatible link kind for `c`
5656
//~| NOTE this link resolved
5757
//~| HELP use its disambiguator
5858

5959
/// Link to [c()]
60-
//~^ ERROR unresolved link to `c`
60+
//~^ ERROR incompatible link kind for `c`
6161
//~| NOTE this link resolved
6262
//~| HELP use its disambiguator
6363
pub fn f() {}

‎src/test/rustdoc-ui/intra-links-disambiguator-mismatch.stderr‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: unresolved link to `S`
1+
error: incompatible link kind for `S`
22
--> $DIR/intra-links-disambiguator-mismatch.rs:14:14
33
|
44
LL | /// Link to [struct@S]
@@ -11,71 +11,71 @@ LL | #![deny(broken_intra_doc_links)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^
1212
= note: this link resolved to an enum, which is not a struct
1313

14-
error: unresolved link to `S`
14+
error: incompatible link kind for `S`
1515
--> $DIR/intra-links-disambiguator-mismatch.rs:19:14
1616
|
1717
LL | /// Link to [mod@S]
1818
| ^^^^^ help: to link to the enum, use its disambiguator: `enum@S`
1919
|
2020
= note: this link resolved to an enum, which is not a module
2121

22-
error: unresolved link to `S`
22+
error: incompatible link kind for `S`
2323
--> $DIR/intra-links-disambiguator-mismatch.rs:24:14
2424
|
2525
LL | /// Link to [union@S]
2626
| ^^^^^^^ help: to link to the enum, use its disambiguator: `enum@S`
2727
|
2828
= note: this link resolved to an enum, which is not a union
2929

30-
error: unresolved link to `S`
30+
error: incompatible link kind for `S`
3131
--> $DIR/intra-links-disambiguator-mismatch.rs:29:14
3232
|
3333
LL | /// Link to [trait@S]
3434
| ^^^^^^^ help: to link to the enum, use its disambiguator: `enum@S`
3535
|
3636
= note: this link resolved to an enum, which is not a trait
3737

38-
error: unresolved link to `T`
38+
error: incompatible link kind for `T`
3939
--> $DIR/intra-links-disambiguator-mismatch.rs:34:14
4040
|
4141
LL | /// Link to [struct@T]
4242
| ^^^^^^^^ help: to link to the trait, use its disambiguator: `trait@T`
4343
|
4444
= note: this link resolved to a trait, which is not a struct
4545

46-
error: unresolved link to `m`
46+
error: incompatible link kind for `m`
4747
--> $DIR/intra-links-disambiguator-mismatch.rs:39:14
4848
|
4949
LL | /// Link to [derive@m]
5050
| ^^^^^^^^ help: to link to the macro, use its disambiguator: `m!`
5151
|
5252
= note: this link resolved to a macro, which is not a derive macro
5353

54-
error: unresolved link to `s`
54+
error: incompatible link kind for `s`
5555
--> $DIR/intra-links-disambiguator-mismatch.rs:44:14
5656
|
5757
LL | /// Link to [const@s]
5858
| ^^^^^^^ help: to link to the static, use its disambiguator: `static@s`
5959
|
6060
= note: this link resolved to a static, which is not a constant
6161

62-
error: unresolved link to `c`
62+
error: incompatible link kind for `c`
6363
--> $DIR/intra-links-disambiguator-mismatch.rs:49:14
6464
|
6565
LL | /// Link to [static@c]
6666
| ^^^^^^^^ help: to link to the constant, use its disambiguator: `const@c`
6767
|
6868
= note: this link resolved to a constant, which is not a static
6969

70-
error: unresolved link to `c`
70+
error: incompatible link kind for `c`
7171
--> $DIR/intra-links-disambiguator-mismatch.rs:54:14
7272
|
7373
LL | /// Link to [fn@c]
7474
| ^^^^ help: to link to the constant, use its disambiguator: `const@c`
7575
|
7676
= note: this link resolved to a constant, which is not a function
7777

78-
error: unresolved link to `c`
78+
error: incompatible link kind for `c`
7979
--> $DIR/intra-links-disambiguator-mismatch.rs:59:14
8080
|
8181
LL | /// Link to [c()]

0 commit comments

Comments
 (0)