Skip to content

Commit e0bdc46

Browse files
Update uitest stderr
Signed-off-by: Jonathan Brouwer <[email protected]>
1 parent f328709 commit e0bdc46

File tree

2 files changed

+4
-50
lines changed

2 files changed

+4
-50
lines changed

tests/ui/parser/bad-lit-suffixes.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,14 @@ fn g() {}
3838

3939
#[link(name = "string"suffix)]
4040
//~^ ERROR suffixes on string literals are invalid
41-
//~| ERROR malformed `link` attribute input
4241
extern "C" {}
4342

4443
#[rustc_layout_scalar_valid_range_start(0suffix)]
4544
//~^ ERROR invalid suffix `suffix` for number literal
46-
//~| ERROR malformed `rustc_layout_scalar_valid_range_start` attribute input
4745
struct S;
4846

4947
impl S {
5048
#[rustc_confusables("blah"suffix)]
5149
//~^ ERROR suffixes on string literals are invalid
52-
//~| ERROR malformed `rustc_confusables` attribute input
5350
fn woof() { }
54-
}
51+
}

tests/ui/parser/bad-lit-suffixes.stderr

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -160,63 +160,20 @@ error: suffixes on string literals are invalid
160160
LL | #[link(name = "string"suffix)]
161161
| ^^^^^^^^^^^^^^ invalid suffix `suffix`
162162

163-
error[E0539]: malformed `link` attribute input
164-
--> $DIR/bad-lit-suffixes.rs:39:1
165-
|
166-
LL | #[link(name = "string"suffix)]
167-
| ^^^^^^^---------------------^^
168-
| |
169-
| expected this to be of the form `name = "..."`
170-
|
171-
= note: for more information, visit <https://doc.rust-lang.org/reference/items/external-blocks.html#the-link-attribute>
172-
help: try changing it to one of the following valid forms of the attribute
173-
|
174-
LL - #[link(name = "string"suffix)]
175-
LL + #[link(name = "...")]
176-
|
177-
LL - #[link(name = "string"suffix)]
178-
LL + #[link(name = "...", import_name_type = "decorated|noprefix|undecorated")]
179-
|
180-
LL - #[link(name = "string"suffix)]
181-
LL + #[link(name = "...", kind = "dylib|static|...")]
182-
|
183-
LL - #[link(name = "string"suffix)]
184-
LL + #[link(name = "...", kind = "dylib|static|...", wasm_import_module = "...", import_name_type = "decorated|noprefix|undecorated")]
185-
|
186-
= and 1 other candidate
187-
188163
error: invalid suffix `suffix` for number literal
189-
--> $DIR/bad-lit-suffixes.rs:44:41
164+
--> $DIR/bad-lit-suffixes.rs:43:41
190165
|
191166
LL | #[rustc_layout_scalar_valid_range_start(0suffix)]
192167
| ^^^^^^^ invalid suffix `suffix`
193168
|
194169
= help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
195170

196-
error[E0539]: malformed `rustc_layout_scalar_valid_range_start` attribute input
197-
--> $DIR/bad-lit-suffixes.rs:44:1
198-
|
199-
LL | #[rustc_layout_scalar_valid_range_start(0suffix)]
200-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------^^
201-
| | |
202-
| | expected an integer literal here
203-
| help: must be of the form: `#[rustc_layout_scalar_valid_range_start(start)]`
204-
205171
error: suffixes on string literals are invalid
206-
--> $DIR/bad-lit-suffixes.rs:50:25
172+
--> $DIR/bad-lit-suffixes.rs:48:25
207173
|
208174
LL | #[rustc_confusables("blah"suffix)]
209175
| ^^^^^^^^^^^^ invalid suffix `suffix`
210176

211-
error[E0539]: malformed `rustc_confusables` attribute input
212-
--> $DIR/bad-lit-suffixes.rs:50:5
213-
|
214-
LL | #[rustc_confusables("blah"suffix)]
215-
| ^^^^^^^^^^^^^^^^^^^^------------^^
216-
| | |
217-
| | expected a string literal here
218-
| help: must be of the form: `#[rustc_confusables("name1", "name2", ...)]`
219-
220-
error: aborting due to 25 previous errors; 2 warnings emitted
177+
error: aborting due to 22 previous errors; 2 warnings emitted
221178

222179
For more information about this error, try `rustc --explain E0539`.

0 commit comments

Comments
 (0)