Skip to content

Commit 3abc6bf

Browse files
committed
UI tests: Fix fallout from removing redundant colons in line annotations
1 parent b807926 commit 3abc6bf

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

tests/ui/coercion/coerce-issue-49593-box-never.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ fn foo(x: !) -> Box<dyn Error> {
1616
// Method resolution will generate new inference vars and relate them.
1717
// Thus fallback will not fall back to `!`, but `()` instead.
1818
Box::<_ /* ! */>::new(x)
19-
//[nofallback]~^ ERROR trait bound `(): std::error:Error` is not satisfied
19+
//[nofallback]~^ ERROR trait bound `(): std::error::Error` is not satisfied
2020
}
2121

2222
fn foo_raw_ptr(x: !) -> *mut dyn Error {
2323
/* *mut $0 is coerced to *mut Error here */
2424
raw_ptr_box::<_ /* ! */>(x)
25-
//[nofallback]~^ ERROR trait bound `(): std::error:Error` is not satisfied
25+
//[nofallback]~^ ERROR trait bound `(): std::error::Error` is not satisfied
2626
}
2727

2828
fn no_coercion(d: *mut dyn Error) -> *mut dyn Error {

tests/ui/consts/const-eval/issue-85155.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ fn main() {
2020
//~^ NOTE the above error was encountered while instantiating
2121
}
2222

23-
//~? ERROR evaluation of `post_monomorphization_error:ValidateConstImm::<2, 0, 1>::VALID` failed
23+
//~? ERROR evaluation of `post_monomorphization_error::ValidateConstImm::<2, 0, 1>::VALID` failed
2424
//~? NOTE erroneous constant encountered

tests/ui/lint/dead-code/tuple-struct-field.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::marker::PhantomData;
66
const LEN: usize = 4;
77

88
struct UnusedAtTheEnd(i32, f32, [u8; LEN], String, u8);
9-
//~^ ERRORfields `1`, `2`, `3`, and `4` are never read
9+
//~^ ERROR fields `1`, `2`, `3`, and `4` are never read
1010
//~| NOTE fields in this struct
1111
//~| HELP consider removing these fields
1212

tests/ui/lint/lint-qualification.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn main() {
2121
//~^ ERROR unnecessary qualification
2222
//~| ERROR unnecessary qualification
2323

24-
24+
2525
//~^ ERROR unused import: `std::fmt`
2626
let _: std::fmt::Result = Ok(());
2727
// don't report unnecessary qualification because fix(#122373) for issue #121331

tests/ui/parser/brace-in-let-chain.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: this file contains an unclosed delimiter
2-
--> $DIR/brace-in-let-chain.rs:58:54
2+
--> $DIR/brace-in-let-chain.rs:58:53
33
|
44
LL | fn main() {
55
| - unclosed delimiter
@@ -25,7 +25,7 @@ LL | && let () = ()
2525
LL | }
2626
| - ...as it matches this but it has different indentation
2727
LL | }
28-
| ^
28+
| ^
2929

3030
error: aborting due to 1 previous error
3131

tests/ui/try-trait/bad-question-mark-on-trait-object.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
struct E;
2-
//~^ NOTE `E` needs to implement `std::error:Error`
2+
//~^ NOTE `E` needs to implement `std::error::Error`
33
//~| NOTE alternatively, `E` needs to implement `Into<X>`
44
struct X; //~ NOTE `X` needs to implement `From<E>`
55

6-
fn foo() -> Result<(), Box<dyn std::error::Error>> { //~ NOTE required `E: std::error:Error` because of this
6+
fn foo() -> Result<(), Box<dyn std::error::Error>> { //~ NOTE required `E: std::error::Error` because of this
77
Ok(bar()?)
8-
//~^ ERROR `?` couldn't convert the error: `E: std::error:Error` is not satisfied
9-
//~| NOTE the trait `std::error:Error` is not implemented for `E`
8+
//~^ ERROR `?` couldn't convert the error: `E: std::error::Error` is not satisfied
9+
//~| NOTE the trait `std::error::Error` is not implemented for `E`
1010
//~| NOTE the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait
11-
//~| NOTE required for `Box<dyn std::error:Error>` to implement `From<E>`
11+
//~| NOTE required for `Box<dyn std::error::Error>` to implement `From<E>`
1212
//~| NOTE this has type `Result<_, E>`
1313
//~| NOTE in this expansion
1414
//~| NOTE in this expansion

0 commit comments

Comments
 (0)