Skip to content

Commit 71eb84f

Browse files
weihangloweihanglo
authored
update tests to match lint message changes from rust-lang/rust#140794 (#15849)
Needed for [rust-lang/rust#140794](rust-lang/rust#140794) (not merged yet).
2 parents 9c7bc45 + cec8eb1 commit 71eb84f

File tree

6 files changed

+185
-173
lines changed

6 files changed

+185
-173
lines changed

‎Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/rustfix/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rustfix"
3-
version = "0.9.2"
3+
version = "0.9.3"
44
authors = [
55
"Pascal Hertleif <killercup@gmail.com>",
66
"Oliver Schneider <oli-obk@users.noreply.github.com>",

‎crates/rustfix/tests/everything/multiple-solutions.json

Lines changed: 117 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,166 +1,166 @@
11
{
22
"$message_type": "diagnostic",
3-
"message": "unused imports: `HashMap`, `VecDeque`",
4-
"code": {
5-
"code": "unused_imports",
6-
"explanation": null
7-
},
8-
"level": "warning",
9-
"spans": [
10-
{
11-
"file_name": "./tests/everything/multiple-solutions.nightly.rs",
12-
"byte_start": 23,
13-
"byte_end": 30,
14-
"line_start": 1,
15-
"line_end": 1,
16-
"column_start": 24,
17-
"column_end": 31,
18-
"is_primary": true,
19-
"text": [
20-
{
21-
"text": "use std::collections::{HashMap, HashSet, VecDeque};",
22-
"highlight_start": 24,
23-
"highlight_end": 31
24-
}
25-
],
26-
"label": null,
27-
"suggested_replacement": null,
28-
"suggestion_applicability": null,
29-
"expansion": null
30-
},
31-
{
32-
"file_name": "./tests/everything/multiple-solutions.nightly.rs",
33-
"byte_start": 41,
34-
"byte_end": 49,
35-
"line_start": 1,
36-
"line_end": 1,
37-
"column_start": 42,
38-
"column_end": 50,
39-
"is_primary": true,
40-
"text": [
41-
{
42-
"text": "use std::collections::{HashMap, HashSet, VecDeque};",
43-
"highlight_start": 42,
44-
"highlight_end": 50
45-
}
46-
],
47-
"label": null,
48-
"suggested_replacement": null,
49-
"suggestion_applicability": null,
50-
"expansion": null
51-
}
52-
],
533
"children": [
544
{
55-
"message": "`#[warn(unused_imports)]` on by default",
5+
"children": [],
566
"code": null,
577
"level": "note",
58-
"spans": [],
59-
"children": [],
60-
"rendered": null
8+
"message": "`#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default",
9+
"rendered": null,
10+
"spans": []
6111
},
6212
{
63-
"message": "remove the unused imports",
13+
"children": [],
6414
"code": null,
6515
"level": "help",
16+
"message": "remove the unused imports",
17+
"rendered": null,
6618
"spans": [
6719
{
68-
"file_name": "./tests/everything/multiple-solutions.nightly.rs",
69-
"byte_start": 22,
70-
"byte_end": 23,
71-
"line_start": 1,
72-
"line_end": 1,
73-
"column_start": 23,
74-
"column_end": 24,
20+
"byte_end": 32,
21+
"byte_start": 23,
22+
"column_end": 33,
23+
"column_start": 24,
24+
"expansion": null,
25+
"file_name": "./tests/everything/multiple-solutions.rs",
7526
"is_primary": true,
76-
"text": [
77-
{
78-
"text": "use std::collections::{HashMap, HashSet, VecDeque};",
79-
"highlight_start": 23,
80-
"highlight_end": 24
81-
}
82-
],
8327
"label": null,
28+
"line_end": 1,
29+
"line_start": 1,
8430
"suggested_replacement": "",
8531
"suggestion_applicability": "MachineApplicable",
86-
"expansion": null
87-
},
88-
{
89-
"file_name": "./tests/everything/multiple-solutions.nightly.rs",
90-
"byte_start": 23,
91-
"byte_end": 32,
92-
"line_start": 1,
93-
"line_end": 1,
94-
"column_start": 24,
95-
"column_end": 33,
96-
"is_primary": true,
9732
"text": [
9833
{
99-
"text": "use std::collections::{HashMap, HashSet, VecDeque};",
34+
"highlight_end": 33,
10035
"highlight_start": 24,
101-
"highlight_end": 33
36+
"text": "use std::collections::{HashMap, HashSet, VecDeque};"
10237
}
103-
],
104-
"label": null,
105-
"suggested_replacement": "",
106-
"suggestion_applicability": "MachineApplicable",
107-
"expansion": null
38+
]
10839
},
10940
{
110-
"file_name": "./tests/everything/multiple-solutions.nightly.rs",
111-
"byte_start": 39,
11241
"byte_end": 49,
113-
"line_start": 1,
114-
"line_end": 1,
115-
"column_start": 40,
42+
"byte_start": 39,
11643
"column_end": 50,
44+
"column_start": 40,
45+
"expansion": null,
46+
"file_name": "./tests/everything/multiple-solutions.rs",
11747
"is_primary": true,
48+
"label": null,
49+
"line_end": 1,
50+
"line_start": 1,
51+
"suggested_replacement": "",
52+
"suggestion_applicability": "MachineApplicable",
11853
"text": [
11954
{
120-
"text": "use std::collections::{HashMap, HashSet, VecDeque};",
55+
"highlight_end": 50,
12156
"highlight_start": 40,
122-
"highlight_end": 50
57+
"text": "use std::collections::{HashMap, HashSet, VecDeque};"
12358
}
124-
],
59+
]
60+
},
61+
{
62+
"byte_end": 23,
63+
"byte_start": 22,
64+
"column_end": 24,
65+
"column_start": 23,
66+
"expansion": null,
67+
"file_name": "./tests/everything/multiple-solutions.rs",
68+
"is_primary": true,
12569
"label": null,
70+
"line_end": 1,
71+
"line_start": 1,
12672
"suggested_replacement": "",
12773
"suggestion_applicability": "MachineApplicable",
128-
"expansion": null
74+
"text": [
75+
{
76+
"highlight_end": 24,
77+
"highlight_start": 23,
78+
"text": "use std::collections::{HashMap, HashSet, VecDeque};"
79+
}
80+
]
12981
},
13082
{
131-
"file_name": "./tests/everything/multiple-solutions.nightly.rs",
132-
"byte_start": 49,
13383
"byte_end": 50,
134-
"line_start": 1,
135-
"line_end": 1,
136-
"column_start": 50,
84+
"byte_start": 49,
13785
"column_end": 51,
86+
"column_start": 50,
87+
"expansion": null,
88+
"file_name": "./tests/everything/multiple-solutions.rs",
13889
"is_primary": true,
90+
"label": null,
91+
"line_end": 1,
92+
"line_start": 1,
93+
"suggested_replacement": "",
94+
"suggestion_applicability": "MachineApplicable",
13995
"text": [
14096
{
141-
"text": "use std::collections::{HashMap, HashSet, VecDeque};",
97+
"highlight_end": 51,
14298
"highlight_start": 50,
143-
"highlight_end": 51
99+
"text": "use std::collections::{HashMap, HashSet, VecDeque};"
144100
}
145-
],
146-
"label": null,
147-
"suggested_replacement": "",
148-
"suggestion_applicability": "MachineApplicable",
149-
"expansion": null
101+
]
150102
}
151-
],
152-
"children": [],
153-
"rendered": null
103+
]
154104
}
155105
],
156-
"rendered": "warning: unused imports: `HashMap`, `VecDeque`\n --> ./tests/everything/multiple-solutions.nightly.rs:1:24\n |\n1 | use std::collections::{HashMap, HashSet, VecDeque};\n | ^^^^^^^ ^^^^^^^^\n |\n = note: `#[warn(unused_imports)]` on by default\n\n"
106+
"code": {
107+
"code": "unused_imports",
108+
"explanation": null
109+
},
110+
"level": "warning",
111+
"message": "unused imports: `HashMap` and `VecDeque`",
112+
"rendered": "warning: unused imports: `HashMap` and `VecDeque`/n --> ./tests/everything/multiple-solutions.rs:1:24/n |/n1 | use std::collections::{HashMap, HashSet, VecDeque};/n | ^^^^^^^ ^^^^^^^^/n |/n = note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default/n/n",
113+
"spans": [
114+
{
115+
"byte_end": 30,
116+
"byte_start": 23,
117+
"column_end": 31,
118+
"column_start": 24,
119+
"expansion": null,
120+
"file_name": "./tests/everything/multiple-solutions.rs",
121+
"is_primary": true,
122+
"label": null,
123+
"line_end": 1,
124+
"line_start": 1,
125+
"suggested_replacement": null,
126+
"suggestion_applicability": null,
127+
"text": [
128+
{
129+
"highlight_end": 31,
130+
"highlight_start": 24,
131+
"text": "use std::collections::{HashMap, HashSet, VecDeque};"
132+
}
133+
]
134+
},
135+
{
136+
"byte_end": 49,
137+
"byte_start": 41,
138+
"column_end": 50,
139+
"column_start": 42,
140+
"expansion": null,
141+
"file_name": "./tests/everything/multiple-solutions.rs",
142+
"is_primary": true,
143+
"label": null,
144+
"line_end": 1,
145+
"line_start": 1,
146+
"suggested_replacement": null,
147+
"suggestion_applicability": null,
148+
"text": [
149+
{
150+
"highlight_end": 50,
151+
"highlight_start": 42,
152+
"text": "use std::collections::{HashMap, HashSet, VecDeque};"
153+
}
154+
]
155+
}
156+
]
157157
}
158158
{
159159
"$message_type": "diagnostic",
160-
"message": "1 warning emitted",
160+
"children": [],
161161
"code": null,
162162
"level": "warning",
163-
"spans": [],
164-
"children": [],
165-
"rendered": "warning: 1 warning emitted\n\n"
166-
}
163+
"message": "1 warning emitted",
164+
"rendered": "warning: 1 warning emitted/n/n",
165+
"spans": []
166+
}

0 commit comments

Comments
 (0)