Skip to content

Commit 42f3d7f

Browse files
bless correct tests
1 parent 3289351 commit 42f3d7f

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

tests/ui/imports/import-loop-2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
mod a {
2-
pub use crate::b::x;
2+
pub use crate::b::x; //~ ERROR unresolved import `crate::b::x`
33
}
44

55
mod b {
6-
pub use crate::a::x; //~ ERROR unresolved import `crate::a::x`
6+
pub use crate::a::x;
77

88
fn main() { let y = x; }
99
}

tests/ui/imports/import-loop-2.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error[E0432]: unresolved import `crate::a::x`
2-
--> $DIR/import-loop-2.rs:6:13
1+
error[E0432]: unresolved import `crate::b::x`
2+
--> $DIR/import-loop-2.rs:2:13
33
|
4-
LL | pub use crate::a::x;
5-
| ^^^^^^^^^^^ no `x` in `a`
4+
LL | pub use crate::b::x;
5+
| ^^^^^^^^^^^ no `x` in `b`
66

77
error: aborting due to 1 previous error
88

tests/ui/imports/reexports.stderr

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,33 @@ LL | pub use super::foo;
1111
| ^^^^^^^^^^
1212

1313
error[E0603]: module import `foo` is private
14-
--> $DIR/reexports.rs:37:22
14+
--> $DIR/reexports.rs:36:22
1515
|
16-
LL | use crate::b::b::foo::S as T;
16+
LL | use crate::b::a::foo::S;
1717
| ^^^ private module import
1818
|
1919
note: the module import `foo` is defined here...
20-
--> $DIR/reexports.rs:29:17
20+
--> $DIR/reexports.rs:24:17
2121
|
22-
LL | pub use super::*; // This is also OK since the value `foo` is visible enough.
23-
| ^^^^^^^^
22+
LL | pub use super::foo; // This is OK since the value `foo` is visible enough.
23+
| ^^^^^^^^^^
2424
note: ...and refers to the module `foo` which is defined here
2525
--> $DIR/reexports.rs:19:5
2626
|
2727
LL | mod foo {
2828
| ^^^^^^^
2929

3030
error[E0603]: module import `foo` is private
31-
--> $DIR/reexports.rs:36:22
31+
--> $DIR/reexports.rs:37:22
3232
|
33-
LL | use crate::b::a::foo::S;
33+
LL | use crate::b::b::foo::S as T;
3434
| ^^^ private module import
3535
|
3636
note: the module import `foo` is defined here...
37-
--> $DIR/reexports.rs:24:17
37+
--> $DIR/reexports.rs:29:17
3838
|
39-
LL | pub use super::foo; // This is OK since the value `foo` is visible enough.
40-
| ^^^^^^^^^^
39+
LL | pub use super::*; // This is also OK since the value `foo` is visible enough.
40+
| ^^^^^^^^
4141
note: ...and refers to the module `foo` which is defined here
4242
--> $DIR/reexports.rs:19:5
4343
|

tests/ui/privacy/privacy1.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,6 @@ LL | mod baz {
2323
| ^^^^^^^
2424
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
2525

26-
error[E0603]: module `baz` is private
27-
--> $DIR/privacy1.rs:147:18
28-
|
29-
LL | use bar::baz;
30-
| ^^^ private module
31-
|
32-
note: the module `baz` is defined here
33-
--> $DIR/privacy1.rs:56:5
34-
|
35-
LL | mod baz {
36-
| ^^^^^^^
37-
3826
error[E0603]: module `i` is private
3927
--> $DIR/privacy1.rs:171:20
4028
|
@@ -47,6 +35,18 @@ note: the module `i` is defined here
4735
LL | mod i {
4836
| ^^^^^
4937

38+
error[E0603]: module `baz` is private
39+
--> $DIR/privacy1.rs:147:18
40+
|
41+
LL | use bar::baz;
42+
| ^^^ private module
43+
|
44+
note: the module `baz` is defined here
45+
--> $DIR/privacy1.rs:56:5
46+
|
47+
LL | mod baz {
48+
| ^^^^^^^
49+
5050
error[E0603]: module `baz` is private
5151
--> $DIR/privacy1.rs:110:21
5252
|

0 commit comments

Comments
 (0)