bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

test: Update tests with fallout of changes

Browse source 
The error messages of the two tests effected degraded in quality. The
errors no longer suggest types in other modules as they now assume that
the arguments are const args, not type args.
This commit is contained in:
Gabriel Smith 2019-11-18 14:57:46 -05:00
parent eaf8fd0569
commit 0207a15fa1
4 changed files with 54 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/test/ui/privacy/privacy-ns1.rs
View file

@ -32,7 +32,8 @@ pub mod foo2 {
fn test_glob2() {
use foo2::*;
let _x: Box<Bar>; //~ ERROR expected type, found function `Bar`
let _x: Box<Bar>; //~ ERROR wrong number of const arguments: expected 0, found 1
//~^ ERROR wrong number of type arguments: expected 1, found 0
}
// neither public

44
src/test/ui/privacy/privacy-ns1.stderr
View file

@ -20,30 +20,8 @@ LL | use foo2::Bar;
LL | use foo3::Bar;
|
error[E0573]: expected type, found function `Bar`
--> $DIR/privacy-ns1.rs:35:17
|
LL | pub struct Baz;
| --------------- similarly named struct `Baz` defined here
...
LL | let _x: Box<Bar>;
| ^^^
|
help: a struct with a similar name exists
|
LL | let _x: Box<Baz>;
| ^^^
help: possible better candidates are found in other modules, you can import them into scope
|
LL | use foo1::Bar;
|
LL | use foo2::Bar;
|
LL | use foo3::Bar;
|
error[E0425]: cannot find function, tuple struct or tuple variant `Bar` in this scope
--> $DIR/privacy-ns1.rs:50:5
--> $DIR/privacy-ns1.rs:51:5
|
LL | pub struct Baz;
| --------------- similarly named unit struct `Baz` defined here
@ -65,7 +43,7 @@ LL | use foo3::Bar;
|
error[E0412]: cannot find type `Bar` in this scope
--> $DIR/privacy-ns1.rs:51:17
--> $DIR/privacy-ns1.rs:52:17
|
LL | pub struct Baz;
| --------------- similarly named struct `Baz` defined here
@ -86,7 +64,19 @@ LL | use foo2::Bar;
LL | use foo3::Bar;
|
error: aborting due to 4 previous errors
error[E0107]: wrong number of const arguments: expected 0, found 1
--> $DIR/privacy-ns1.rs:35:17
|
LL | let _x: Box<Bar>;
| ^^^ unexpected const argument
Some errors have detailed explanations: E0412, E0423, E0425, E0573.
For more information about an error, try `rustc --explain E0412`.
error[E0107]: wrong number of type arguments: expected 1, found 0
--> $DIR/privacy-ns1.rs:35:13
|
LL | let _x: Box<Bar>;
| ^^^^^^^^ expected 1 type argument
error: aborting due to 5 previous errors
Some errors have detailed explanations: E0107, E0412, E0423, E0425.
For more information about an error, try `rustc --explain E0107`.

6
src/test/ui/privacy/privacy-ns2.rs
View file

@ -38,14 +38,16 @@ pub mod foo2 {
fn test_single2() {
use foo2::Bar;
let _x : Box<Bar>; //~ ERROR expected type, found function `Bar`
let _x : Box<Bar>; //~ ERROR wrong number of const arguments: expected 0, found 1
//~^ ERROR wrong number of type arguments: expected 1, found 0
let _x : Bar(); //~ ERROR expected type, found function `Bar`
}
fn test_list2() {
use foo2::{Bar,Baz};
let _x: Box<Bar>; //~ ERROR expected type, found function `Bar`
let _x: Box<Bar>; //~ ERROR wrong number of const arguments: expected 0, found 1
//~^ ERROR wrong number of type arguments: expected 1, found 0
}
// neither public

75
src/test/ui/privacy/privacy-ns2.stderr
View file

@ -36,22 +36,7 @@ LL | use foo3::Bar;
|
error[E0573]: expected type, found function `Bar`
--> $DIR/privacy-ns2.rs:41:18
|
LL | let _x : Box<Bar>;
| ^^^ not a type
|
help: possible better candidates are found in other modules, you can import them into scope
|
LL | use foo1::Bar;
|
LL | use foo2::Bar;
|
LL | use foo3::Bar;
|
error[E0573]: expected type, found function `Bar`
--> $DIR/privacy-ns2.rs:42:14
--> $DIR/privacy-ns2.rs:43:14
|
LL | let _x : Bar();
| ^^^^^ not a type
@ -69,47 +54,49 @@ LL | use foo2::Bar;
LL | use foo3::Bar;
|
error[E0573]: expected type, found function `Bar`
--> $DIR/privacy-ns2.rs:48:17
|
LL | pub struct Baz;
| --------------- similarly named struct `Baz` defined here
...
LL | let _x: Box<Bar>;
| ^^^
|
help: a struct with a similar name exists
|
LL | let _x: Box<Baz>;
| ^^^
help: possible better candidates are found in other modules, you can import them into scope
|
LL | use foo1::Bar;
|
LL | use foo2::Bar;
|
LL | use foo3::Bar;
|
error[E0603]: trait `Bar` is private
--> $DIR/privacy-ns2.rs:61:15
--> $DIR/privacy-ns2.rs:63:15
|
LL | use foo3::Bar;
| ^^^
error[E0603]: trait `Bar` is private
--> $DIR/privacy-ns2.rs:65:15
--> $DIR/privacy-ns2.rs:67:15
|
LL | use foo3::Bar;
| ^^^
error[E0603]: trait `Bar` is private
--> $DIR/privacy-ns2.rs:72:16
--> $DIR/privacy-ns2.rs:74:16
|
LL | use foo3::{Bar,Baz};
| ^^^
error: aborting due to 8 previous errors
error[E0107]: wrong number of const arguments: expected 0, found 1
--> $DIR/privacy-ns2.rs:41:18
|
LL | let _x : Box<Bar>;
| ^^^ unexpected const argument
Some errors have detailed explanations: E0423, E0573, E0603.
For more information about an error, try `rustc --explain E0423`.
error[E0107]: wrong number of type arguments: expected 1, found 0
--> $DIR/privacy-ns2.rs:41:14
|
LL | let _x : Box<Bar>;
| ^^^^^^^^ expected 1 type argument
error[E0107]: wrong number of const arguments: expected 0, found 1
--> $DIR/privacy-ns2.rs:49:17
|
LL | let _x: Box<Bar>;
| ^^^ unexpected const argument
error[E0107]: wrong number of type arguments: expected 1, found 0
--> $DIR/privacy-ns2.rs:49:13
|
LL | let _x: Box<Bar>;
| ^^^^^^^^ expected 1 type argument
error: aborting due to 10 previous errors
Some errors have detailed explanations: E0107, E0423, E0573, E0603.
For more information about an error, try `rustc --explain E0107`.