mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #60126 - estebank:continue-eval, r=oli-obk

Browse Source 
Continue evaluating after item-type checking

Fix #30999.

r? @oli-obk
This commit is contained in:
bors 2019-04-22 21:46:07 +00:00
commit 004c549a73
20 changed files with 179 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustc_interface/passes.rs
View File

@ -966,8 +966,7 @@ fn analysis<'tcx>(
time(sess, "layout testing", || layout_test::test_layout(tcx));
// Avoid overwhelming user with errors if borrow checking failed.
// I'm not sure how helpful this is, to be honest, but it avoids
// a
// I'm not sure how helpful this is, to be honest, but it avoids a
// lot of annoying errors in the compile-fail tests (basically,
// lint warnings and so on -- kindck used to do this abort, but
// kindck is gone now). -nmatsakis

10
src/librustc_typeck/lib.rs
View File

@ -357,12 +357,10 @@ pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>)
time(tcx.sess, "wf checking", || check::check_wf_new(tcx))?;
time(tcx.sess, "item-types checking", || {
tcx.sess.track_errors(|| {
for &module in tcx.hir().krate().modules.keys() {
tcx.ensure().check_mod_item_types(tcx.hir().local_def_id(module));
}
})
})?;
for &module in tcx.hir().krate().modules.keys() {
tcx.ensure().check_mod_item_types(tcx.hir().local_def_id(module));
}
});
time(tcx.sess, "item-bodies checking", || tcx.typeck_item_bodies(LOCAL_CRATE));

22
src/test/ui/c-variadic/variadic-ffi-1.rs
View File

@ -12,20 +12,18 @@
extern "C" fn bar(f: isize, x: u8) {}
fn main() {
// errors below are no longer checked because error above aborts
// compilation; see variadic-ffi-3.rs for corresponding test.
unsafe {
foo();
foo(1);
foo(); //~ ERROR this function takes at least 2 parameters but 0 parameters were supplied
foo(1); //~ ERROR this function takes at least 2 parameters but 1 parameter was supplied
let x: unsafe extern "C" fn(f: isize, x: u8) = foo;
let y: extern "C" fn(f: isize, x: u8, ...) = bar;
let x: unsafe extern "C" fn(f: isize, x: u8) = foo; //~ ERROR mismatched types
let y: extern "C" fn(f: isize, x: u8, ...) = bar; //~ ERROR mismatched types
foo(1, 2, 3f32);
foo(1, 2, true);
foo(1, 2, 1i8);
foo(1, 2, 1u8);
foo(1, 2, 1i16);
foo(1, 2, 1u16);
foo(1, 2, 3f32); //~ ERROR can't pass
foo(1, 2, true); //~ ERROR can't pass
foo(1, 2, 1i8); //~ ERROR can't pass
foo(1, 2, 1u8); //~ ERROR can't pass
foo(1, 2, 1i16); //~ ERROR can't pass
foo(1, 2, 1u16); //~ ERROR can't pass
}
}

77
src/test/ui/c-variadic/variadic-ffi-1.stderr
View File

@ -4,6 +4,79 @@ error[E0045]: C-variadic function must have C or cdecl calling convention
LL | fn printf(_: *const u8, ...);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C-variadics require C or cdecl calling convention
error: aborting due to previous error
error[E0060]: this function takes at least 2 parameters but 0 parameters were supplied
--> $DIR/variadic-ffi-1.rs:16:9
|
LL | fn foo(f: isize, x: u8, ...);
| ----------------------------- defined here
...
LL | foo();
| ^^^^^ expected at least 2 parameters
For more information about this error, try `rustc --explain E0045`.
error[E0060]: this function takes at least 2 parameters but 1 parameter was supplied
--> $DIR/variadic-ffi-1.rs:17:9
|
LL | fn foo(f: isize, x: u8, ...);
| ----------------------------- defined here
...
LL | foo(1);
| ^^^^^^ expected at least 2 parameters
error[E0308]: mismatched types
--> $DIR/variadic-ffi-1.rs:19:56
|
LL | let x: unsafe extern "C" fn(f: isize, x: u8) = foo;
| ^^^ expected non-variadic fn, found variadic function
|
= note: expected type `unsafe extern "C" fn(isize, u8)`
found type `for<'r> unsafe extern "C" fn(isize, u8, std::ffi::VaList<'r>, ...) {foo}`
error[E0308]: mismatched types
--> $DIR/variadic-ffi-1.rs:20:54
|
LL | let y: extern "C" fn(f: isize, x: u8, ...) = bar;
| ^^^ expected variadic fn, found non-variadic function
|
= note: expected type `for<'r> extern "C" fn(isize, u8, std::ffi::VaList<'r>, ...)`
found type `extern "C" fn(isize, u8) {bar}`
error[E0617]: can't pass `f32` to variadic function
--> $DIR/variadic-ffi-1.rs:22:19
|
LL | foo(1, 2, 3f32);
| ^^^^ help: cast the value to `c_double`: `3f32 as c_double`
error[E0617]: can't pass `bool` to variadic function
--> $DIR/variadic-ffi-1.rs:23:19
|
LL | foo(1, 2, true);
| ^^^^ help: cast the value to `c_int`: `true as c_int`
error[E0617]: can't pass `i8` to variadic function
--> $DIR/variadic-ffi-1.rs:24:19
|
LL | foo(1, 2, 1i8);
| ^^^ help: cast the value to `c_int`: `1i8 as c_int`
error[E0617]: can't pass `u8` to variadic function
--> $DIR/variadic-ffi-1.rs:25:19
|
LL | foo(1, 2, 1u8);
| ^^^ help: cast the value to `c_uint`: `1u8 as c_uint`
error[E0617]: can't pass `i16` to variadic function
--> $DIR/variadic-ffi-1.rs:26:19
|
LL | foo(1, 2, 1i16);
| ^^^^ help: cast the value to `c_int`: `1i16 as c_int`
error[E0617]: can't pass `u16` to variadic function
--> $DIR/variadic-ffi-1.rs:27:19
|
LL | foo(1, 2, 1u16);
| ^^^^ help: cast the value to `c_uint`: `1u16 as c_uint`
error: aborting due to 11 previous errors
Some errors have detailed explanations: E0045, E0060, E0308, E0617.
For more information about an error, try `rustc --explain E0045`.

29
src/test/ui/c-variadic/variadic-ffi-3.rs
View File

@ -1,29 +0,0 @@
extern {
fn foo(f: isize, x: u8, ...);
//~^ defined here
//~| defined here
}
extern "C" fn bar(f: isize, x: u8) {}
fn main() {
unsafe {
foo(); //~ ERROR: this function takes at least 2 parameters but 0 parameters were supplied
foo(1); //~ ERROR: this function takes at least 2 parameters but 1 parameter was supplied
let x: unsafe extern "C" fn(f: isize, x: u8) = foo;
//~^ ERROR: mismatched types
//~| expected type `unsafe extern "C" fn(isize, u8)`
let y: extern "C" fn(f: isize, x: u8, ...) = bar;
//~^ ERROR: mismatched types
//~| expected type `for<'r> extern "C" fn(isize, u8, std::ffi::VaList<'r>, ...)`
foo(1, 2, 3f32); //~ ERROR can't pass `f32` to variadic function
foo(1, 2, true); //~ ERROR can't pass `bool` to variadic function
foo(1, 2, 1i8); //~ ERROR can't pass `i8` to variadic function
foo(1, 2, 1u8); //~ ERROR can't pass `u8` to variadic function
foo(1, 2, 1i16); //~ ERROR can't pass `i16` to variadic function
foo(1, 2, 1u16); //~ ERROR can't pass `u16` to variadic function
}
}

76
src/test/ui/c-variadic/variadic-ffi-3.stderr
View File

@ -1,76 +0,0 @@
error[E0060]: this function takes at least 2 parameters but 0 parameters were supplied
--> $DIR/variadic-ffi-3.rs:11:9
|
LL | fn foo(f: isize, x: u8, ...);
| ----------------------------- defined here
...
LL | foo();
| ^^^^^ expected at least 2 parameters
error[E0060]: this function takes at least 2 parameters but 1 parameter was supplied
--> $DIR/variadic-ffi-3.rs:12:9
|
LL | fn foo(f: isize, x: u8, ...);
| ----------------------------- defined here
...
LL | foo(1);
| ^^^^^^ expected at least 2 parameters
error[E0308]: mismatched types
--> $DIR/variadic-ffi-3.rs:14:56
|
LL | let x: unsafe extern "C" fn(f: isize, x: u8) = foo;
| ^^^ expected non-variadic fn, found variadic function
|
= note: expected type `unsafe extern "C" fn(isize, u8)`
found type `for<'r> unsafe extern "C" fn(isize, u8, std::ffi::VaList<'r>, ...) {foo}`
error[E0308]: mismatched types
--> $DIR/variadic-ffi-3.rs:18:54
|
LL | let y: extern "C" fn(f: isize, x: u8, ...) = bar;
| ^^^ expected variadic fn, found non-variadic function
|
= note: expected type `for<'r> extern "C" fn(isize, u8, std::ffi::VaList<'r>, ...)`
found type `extern "C" fn(isize, u8) {bar}`
error[E0617]: can't pass `f32` to variadic function
--> $DIR/variadic-ffi-3.rs:22:19
|
LL | foo(1, 2, 3f32);
| ^^^^ help: cast the value to `c_double`: `3f32 as c_double`
error[E0617]: can't pass `bool` to variadic function
--> $DIR/variadic-ffi-3.rs:23:19
|
LL | foo(1, 2, true);
| ^^^^ help: cast the value to `c_int`: `true as c_int`
error[E0617]: can't pass `i8` to variadic function
--> $DIR/variadic-ffi-3.rs:24:19
|
LL | foo(1, 2, 1i8);
| ^^^ help: cast the value to `c_int`: `1i8 as c_int`
error[E0617]: can't pass `u8` to variadic function
--> $DIR/variadic-ffi-3.rs:25:19
|
LL | foo(1, 2, 1u8);
| ^^^ help: cast the value to `c_uint`: `1u8 as c_uint`
error[E0617]: can't pass `i16` to variadic function
--> $DIR/variadic-ffi-3.rs:26:19
|
LL | foo(1, 2, 1i16);
| ^^^^ help: cast the value to `c_int`: `1i16 as c_int`
error[E0617]: can't pass `u16` to variadic function
--> $DIR/variadic-ffi-3.rs:27:19
|
LL | foo(1, 2, 1u16);
| ^^^^ help: cast the value to `c_uint`: `1u16 as c_uint`
error: aborting due to 10 previous errors
Some errors have detailed explanations: E0060, E0308, E0617.
For more information about an error, try `rustc --explain E0060`.

2
src/test/ui/in-band-lifetimes/mismatched_trait_impl.rs
View File

@ -7,7 +7,7 @@ trait Get {
impl Get for i32 {
fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 { //~ ERROR cannot infer
x
x //~ ERROR lifetime mismatch
}
}

12
src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr
View File

@ -20,5 +20,15 @@ LL | fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 {
expected fn(&i32, &'a u32, &u32) -> &'a u32
found fn(&i32, &u32, &u32) -> &u32
error: aborting due to previous error
error[E0623]: lifetime mismatch
--> $DIR/mismatched_trait_impl.rs:10:9
|
LL | fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 {
| ---- -------
| |
| this parameter and the return type are declared with different lifetimes...
LL | x
| ^ ...but data from `x` is returned here
error: aborting due to 2 previous errors

1
src/test/ui/infinite/infinite-tag-type-recursion.rs
View File

@ -1,4 +1,5 @@
enum MList { Cons(isize, MList), Nil }
//~^ ERROR recursive type `MList` has infinite size
//~| ERROR cycle detected when processing `MList`
fn main() { let a = MList::Cons(10, MList::Cons(11, MList::Nil)); }

14
src/test/ui/infinite/infinite-tag-type-recursion.stderr
View File

@ -8,6 +8,16 @@ LL | enum MList { Cons(isize, MList), Nil }
|
= help: insert indirection (e.g., a `Box`, `Rc`, or `&`) at some point to make `MList` representable
error: aborting due to previous error
error[E0391]: cycle detected when processing `MList`
--> $DIR/infinite-tag-type-recursion.rs:1:1
|
LL | enum MList { Cons(isize, MList), Nil }
| ^^^^^^^^^^
|
= note: ...which again requires processing `MList`, completing the cycle
= note: cycle used when computing dropck types for `Canonical { max_universe: U0, variables: [], value: ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: UserFacing, def_id: None }, value: MList } }`
For more information about this error, try `rustc --explain E0072`.
error: aborting due to 2 previous errors
Some errors have detailed explanations: E0072, E0391.
For more information about an error, try `rustc --explain E0072`.

2
src/test/ui/issues/issue-16048.rs
View File

@ -22,6 +22,8 @@ fn get<'p, T : Test<'a>>(&self) -> T {
//~^ ERROR E0195
//~| NOTE lifetimes do not match method in trait
return *self as T;
//~^ ERROR non-primitive cast: `Foo<'a>` as `T`
//~| NOTE an `as` expression can only be used to convert between primitive types.
}
}

13
src/test/ui/issues/issue-16048.stderr
View File

@ -7,6 +7,15 @@ LL | fn get<'p, T : Test<'p>>(&self) -> T;
LL | fn get<'p, T : Test<'a>>(&self) -> T {
| ^^^^^^^^^^^^^^^^^^ lifetimes do not match method in trait
error: aborting due to previous error
error[E0605]: non-primitive cast: `Foo<'a>` as `T`
--> $DIR/issue-16048.rs:24:16
|
LL | return *self as T;
| ^^^^^^^^^^
|
= note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait
For more information about this error, try `rustc --explain E0195`.
error: aborting due to 2 previous errors
Some errors have detailed explanations: E0195, E0605.
For more information about an error, try `rustc --explain E0195`.

4
src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
View File

@ -1,8 +1,8 @@
// compile-flags: --test
use std::num::ParseIntError;
use std::num::ParseFloatError;
#[test]
fn can_parse_zero_as_f32() -> Result<f32, ParseIntError> { //~ ERROR
fn can_parse_zero_as_f32() -> Result<f32, ParseFloatError> { //~ ERROR
"0".parse()
}

6
src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
View File

@ -1,12 +1,12 @@
error[E0277]: `main` has invalid return type `std::result::Result<f32, std::num::ParseIntError>`
error[E0277]: `main` has invalid return type `std::result::Result<f32, std::num::ParseFloatError>`
--> $DIR/termination-trait-test-wrong-type.rs:6:1
|
LL | / fn can_parse_zero_as_f32() -> Result<f32, ParseIntError> {
LL | / fn can_parse_zero_as_f32() -> Result<f32, ParseFloatError> {
LL | | "0".parse()
LL | | }
| |_^ `main` can only return types that implement `std::process::Termination`
|
= help: the trait `std::process::Termination` is not implemented for `std::result::Result<f32, std::num::ParseIntError>`
= help: the trait `std::process::Termination` is not implemented for `std::result::Result<f32, std::num::ParseFloatError>`
= note: required by `test::assert_test_result`
error: aborting due to previous error

19
src/test/ui/structs/struct-base-wrong-type-2.rs
View File

@ -1,19 +0,0 @@
// Check that `base` in `Fru { field: expr, ..base }` must have right type.
//
// See also struct-base-wrong-type.rs, which tests same condition
// within a const expression.
struct Foo { a: isize, b: isize }
struct Bar { x: isize }
fn main() {
let b = Bar { x: 5 };
let f = Foo { a: 2, ..b }; //~ ERROR mismatched types
//~| expected type `Foo`
//~| found type `Bar`
//~| expected struct `Foo`, found struct `Bar`
let f__isize = Foo { a: 2, ..4 }; //~ ERROR mismatched types
//~| expected type `Foo`
//~| found type `{integer}`
//~| expected struct `Foo`, found integer
}

21
src/test/ui/structs/struct-base-wrong-type-2.stderr
View File

@ -1,21 +0,0 @@
error[E0308]: mismatched types
--> $DIR/struct-base-wrong-type-2.rs:11:27
|
LL | let f = Foo { a: 2, ..b };
| ^ expected struct `Foo`, found struct `Bar`
|
= note: expected type `Foo`
found type `Bar`
error[E0308]: mismatched types
--> $DIR/struct-base-wrong-type-2.rs:15:34
|
LL | let f__isize = Foo { a: 2, ..4 };
| ^ expected struct `Foo`, found integer
|
= note: expected type `Foo`
found type `{integer}`
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0308`.

17
src/test/ui/structs/struct-base-wrong-type.rs
View File

@ -1,27 +1,14 @@
// Check that `base` in `Fru { field: expr, ..base }` must have right type.
//
// See also struct-base-wrong-type-2.rs, which tests same condition
// within a function body.
struct Foo { a: isize, b: isize }
struct Bar { x: isize }
static bar: Bar = Bar { x: 5 };
static foo: Foo = Foo { a: 2, ..bar }; //~ ERROR mismatched types
//~| expected type `Foo`
//~| found type `Bar`
//~| expected struct `Foo`, found struct `Bar`
static foo_i: Foo = Foo { a: 2, ..4 }; //~ ERROR mismatched types
//~| expected type `Foo`
//~| found type `{integer}`
//~| expected struct `Foo`, found integer
fn main() {
let b = Bar { x: 5 };
// errors below are no longer caught since error above causes
// compilation to abort before we bother checking function bodies.
// See also struct-base-wrong-type-2.rs, which checks that we
// would catch these errors eventually.
let f = Foo { a: 2, ..b };
let f__isize = Foo { a: 2, ..4 };
let f = Foo { a: 2, ..b }; //~ ERROR mismatched types
let f__isize = Foo { a: 2, ..4 }; //~ ERROR mismatched types
}

24
src/test/ui/structs/struct-base-wrong-type.stderr
View File

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/struct-base-wrong-type.rs:10:33
--> $DIR/struct-base-wrong-type.rs:7:33
|
LL | static foo: Foo = Foo { a: 2, ..bar };
| ^^^ expected struct `Foo`, found struct `Bar`
@ -8,7 +8,7 @@ LL | static foo: Foo = Foo { a: 2, ..bar };
found type `Bar`
error[E0308]: mismatched types
--> $DIR/struct-base-wrong-type.rs:14:35
--> $DIR/struct-base-wrong-type.rs:8:35
|
LL | static foo_i: Foo = Foo { a: 2, ..4 };
| ^ expected struct `Foo`, found integer
@ -16,6 +16,24 @@ LL | static foo_i: Foo = Foo { a: 2, ..4 };
= note: expected type `Foo`
found type `{integer}`
error: aborting due to 2 previous errors
error[E0308]: mismatched types
--> $DIR/struct-base-wrong-type.rs:12:27
|
LL | let f = Foo { a: 2, ..b };
| ^ expected struct `Foo`, found struct `Bar`
|
= note: expected type `Foo`
found type `Bar`
error[E0308]: mismatched types
--> $DIR/struct-base-wrong-type.rs:13:34
|
LL | let f__isize = Foo { a: 2, ..4 };
| ^ expected struct `Foo`, found integer
|
= note: expected type `Foo`
found type `{integer}`
error: aborting due to 4 previous errors
For more information about this error, try `rustc --explain E0308`.

5
src/test/ui/wrong-mul-method-signature.rs
View File

@ -61,9 +61,8 @@ pub fn main() {
let x: Vec1 = Vec1 { x: 1.0 } * 2.0; // this is OK
let x: Vec2 = Vec2 { x: 1.0, y: 2.0 } * 2.0; // trait had reversed order
// (we no longer signal a compile error here, since the
// error in the trait signature will cause compilation to
// abort before we bother looking at function bodies.)
//~^ ERROR mismatched types
//~| ERROR mismatched types
let x: i32 = Vec3 { x: 1.0, y: 2.0, z: 3.0 } * 2.0;
}

23
src/test/ui/wrong-mul-method-signature.stderr
View File

@ -25,6 +25,25 @@ LL | fn mul(self, s: f64) -> f64 {
= note: expected type `fn(Vec3, f64) -> i32`
found type `fn(Vec3, f64) -> f64`
error: aborting due to 3 previous errors
error[E0308]: mismatched types
--> $DIR/wrong-mul-method-signature.rs:63:45
|
LL | let x: Vec2 = Vec2 { x: 1.0, y: 2.0 } * 2.0; // trait had reversed order
| ^^^ expected struct `Vec2`, found floating-point number
|
= note: expected type `Vec2`
found type `{float}`
For more information about this error, try `rustc --explain E0053`.
error[E0308]: mismatched types
--> $DIR/wrong-mul-method-signature.rs:63:19
|
LL | let x: Vec2 = Vec2 { x: 1.0, y: 2.0 } * 2.0; // trait had reversed order
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Vec2`, found f64
|
= note: expected type `Vec2`
found type `f64`
error: aborting due to 5 previous errors
Some errors have detailed explanations: E0053, E0308.
For more information about an error, try `rustc --explain E0053`.