Skip to content

Commit 0bd2ce4

Browse files
bless test for green CI
1 parent 51f18e4 commit 0bd2ce4

File tree

6 files changed

+15
-47
lines changed

6 files changed

+15
-47
lines changed

tests/ui/imports/ambiguous-2.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
//@ check-pass
12
//@ aux-build: ../ambiguous-1.rs
23
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1633574396
34

45
extern crate ambiguous_1;
56

67
fn main() {
7-
ambiguous_1::id(); //~ ERROR cannot find function `id` in crate `ambiguous_1`
8+
ambiguous_1::id();
89
//^ FIXME: `id` should be identified as an ambiguous item.
910
}

tests/ui/imports/ambiguous-2.stderr

Lines changed: 0 additions & 19 deletions
This file was deleted.

tests/ui/imports/ambiguous-4.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
//@ check-pass
12
//@ aux-build: ../ambiguous-4-extern.rs
23

34
extern crate ambiguous_4_extern;
45

56
fn main() {
6-
ambiguous_4_extern::id(); //~ ERROR cannot find function `id` in crate `ambiguous_4_extern`
7+
ambiguous_4_extern::id();
78
//^ FIXME: `id` should be identified as an ambiguous item.
89
}

tests/ui/imports/ambiguous-4.stderr

Lines changed: 0 additions & 19 deletions
This file was deleted.

tests/ui/imports/glob-conflict-cross-crate-1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn main() {
66
glob_conflict::f(); //~ ERROR cannot find function `f` in crate `glob_conflict`
77
//^ FIXME: `glob_conflict::f` should raise an
88
// ambiguity error instead of a not found error.
9-
glob_conflict::glob::f(); //~ ERROR cannot find function `f` in module `glob_conflict::glob`
9+
glob_conflict::glob::f();
1010
//^ FIXME: `glob_conflict::glob::f` should raise an
1111
// ambiguity error instead of a not found error.
1212
}

tests/ui/imports/glob-conflict-cross-crate-1.stderr

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@ error[E0425]: cannot find function `f` in crate `glob_conflict`
33
|
44
LL | glob_conflict::f();
55
| ^ not found in `glob_conflict`
6-
7-
error[E0425]: cannot find function `f` in module `glob_conflict::glob`
8-
--> $DIR/glob-conflict-cross-crate-1.rs:9:26
96
|
10-
LL | glob_conflict::glob::f();
11-
| ^ not found in `glob_conflict::glob`
7+
help: consider importing this function
8+
|
9+
LL + use glob_conflict::glob::f;
10+
|
11+
help: if you import `f`, refer to it directly
12+
|
13+
LL - glob_conflict::f();
14+
LL + f();
15+
|
1216

13-
error: aborting due to 2 previous errors
17+
error: aborting due to 1 previous error
1418

1519
For more information about this error, try `rustc --explain E0425`.

0 commit comments

Comments
 (0)