Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c1b8b7e

Browse files
committedApr 9, 2025·
Auto merge of rust-lang#139555 - petrochenkov:errkind-ann, r=jieyouxu
UI tests: add missing diagnostic kinds where possible The subset of rust-lang#139427 that only adds diagnostic kinds to line annotations, without changing any other things in annotations or compiletest. After this only non-viral `NOTE`s and `HELP`s should be missing. r? `@jieyouxu`
2 parents de5b8a4 + b3f7535 commit c1b8b7e

File tree

370 files changed

+930
-928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

370 files changed

+930
-928
lines changed
 

‎tests/rustdoc-ui/invalid-syntax.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub fn baz() {}
4747
///
4848
/// Indented block end
4949
pub fn quux() {}
50-
//~^^^^^ could not parse code block as Rust code
50+
//~^^^^^ WARN could not parse code block as Rust code
5151

5252
/// Unclosed fence
5353
///

‎tests/rustdoc-ui/issues/ice-generic-type-alias-105742.rs

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,63 +5,63 @@ use std::ops::Index;
55
pub fn next<'a, T>(s: &'a mut dyn SVec<Item = T, Output = T>) {
66
//~^ expected 1 lifetime argument
77
//~| expected 1 generic argument
8-
//~| the trait `SVec` is not dyn compatible
8+
//~| ERROR the trait `SVec` is not dyn compatible
99
//~| `SVec` is not dyn compatible
10-
//~| missing generics for associated type `SVec::Item`
11-
//~| missing generics for associated type `SVec::Item`
10+
//~| ERROR missing generics for associated type `SVec::Item`
11+
//~| ERROR missing generics for associated type `SVec::Item`
1212
let _ = s;
1313
}
1414

1515
pub trait SVec: Index<
1616
<Self as SVec>::Item,
1717
//~^ expected 1 lifetime argument
1818
//~| expected 1 generic argument
19-
//~| missing generics for associated type `SVec::Item`
20-
//~| missing generics for associated type `SVec::Item`
21-
//~| missing generics for associated type `SVec::Item`
22-
//~| missing generics for associated type `SVec::Item`
23-
//~| missing generics for associated type `SVec::Item`
24-
//~| missing generics for associated type `SVec::Item`
25-
//~| missing generics for associated type `SVec::Item`
26-
//~| missing generics for associated type `SVec::Item`
19+
//~| ERROR missing generics for associated type `SVec::Item`
20+
//~| ERROR missing generics for associated type `SVec::Item`
21+
//~| ERROR missing generics for associated type `SVec::Item`
22+
//~| ERROR missing generics for associated type `SVec::Item`
23+
//~| ERROR missing generics for associated type `SVec::Item`
24+
//~| ERROR missing generics for associated type `SVec::Item`
25+
//~| ERROR missing generics for associated type `SVec::Item`
26+
//~| ERROR missing generics for associated type `SVec::Item`
2727
Output = <Index<<Self as SVec>::Item,
2828
//~^ expected 1 lifetime argument
2929
//~| expected 1 generic argument
30-
//~| missing generics for associated type `SVec::Item`
31-
//~| missing generics for associated type `SVec::Item`
32-
//~| missing generics for associated type `SVec::Item`
33-
//~| missing generics for associated type `SVec::Item`
34-
//~| missing generics for associated type `SVec::Item`
35-
//~| missing generics for associated type `SVec::Item`
36-
//~| missing generics for associated type `SVec::Item`
37-
//~| missing generics for associated type `SVec::Item`
30+
//~| ERROR missing generics for associated type `SVec::Item`
31+
//~| ERROR missing generics for associated type `SVec::Item`
32+
//~| ERROR missing generics for associated type `SVec::Item`
33+
//~| ERROR missing generics for associated type `SVec::Item`
34+
//~| ERROR missing generics for associated type `SVec::Item`
35+
//~| ERROR missing generics for associated type `SVec::Item`
36+
//~| ERROR missing generics for associated type `SVec::Item`
37+
//~| ERROR missing generics for associated type `SVec::Item`
3838
Output = <Self as SVec>::Item> as SVec>::Item,
3939
//~^ expected 1 lifetime argument
4040
//~| expected 1 generic argument
4141
//~| expected 1 lifetime argument
42-
//~| missing generics for associated type `SVec::Item`
43-
//~| missing generics for associated type `SVec::Item`
44-
//~| missing generics for associated type `SVec::Item`
45-
//~| missing generics for associated type `SVec::Item`
46-
//~| missing generics for associated type `SVec::Item`
47-
//~| missing generics for associated type `SVec::Item`
42+
//~| ERROR missing generics for associated type `SVec::Item`
43+
//~| ERROR missing generics for associated type `SVec::Item`
44+
//~| ERROR missing generics for associated type `SVec::Item`
45+
//~| ERROR missing generics for associated type `SVec::Item`
46+
//~| ERROR missing generics for associated type `SVec::Item`
47+
//~| ERROR missing generics for associated type `SVec::Item`
4848
//~| expected 1 generic argument
49-
//~| missing generics for associated type `SVec::Item`
50-
//~| missing generics for associated type `SVec::Item`
51-
//~| missing generics for associated type `SVec::Item`
52-
//~| missing generics for associated type `SVec::Item`
53-
//~| missing generics for associated type `SVec::Item`
54-
//~| missing generics for associated type `SVec::Item`
55-
//~| missing generics for associated type `SVec::Item`
56-
//~| missing generics for associated type `SVec::Item`
57-
//~| missing generics for associated type `SVec::Item`
58-
//~| missing generics for associated type `SVec::Item`
49+
//~| ERROR missing generics for associated type `SVec::Item`
50+
//~| ERROR missing generics for associated type `SVec::Item`
51+
//~| ERROR missing generics for associated type `SVec::Item`
52+
//~| ERROR missing generics for associated type `SVec::Item`
53+
//~| ERROR missing generics for associated type `SVec::Item`
54+
//~| ERROR missing generics for associated type `SVec::Item`
55+
//~| ERROR missing generics for associated type `SVec::Item`
56+
//~| ERROR missing generics for associated type `SVec::Item`
57+
//~| ERROR missing generics for associated type `SVec::Item`
58+
//~| ERROR missing generics for associated type `SVec::Item`
5959
> {
6060
type Item<'a, T>;
6161

6262
fn len(&self) -> <Self as SVec>::Item;
6363
//~^ expected 1 lifetime argument
64-
//~| missing generics for associated type `SVec::Item`
64+
//~| ERROR missing generics for associated type `SVec::Item`
6565
//~| expected 1 generic argument
66-
//~| missing generics for associated type `SVec::Item`
66+
//~| ERROR missing generics for associated type `SVec::Item`
6767
}

0 commit comments

Comments
 (0)
This repository has been archived.