Skip to content

Commit

Permalink
Fix tests again
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnTitor committed Sep 1, 2019
1 parent 0cd9c16 commit a937d8c
Show file tree
Hide file tree
Showing 14 changed files with 542 additions and 72 deletions.
3 changes: 1 addition & 2 deletions src/test/ui/consts/const-err2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#![feature(rustc_attrs)]
#![allow(exceeding_bitshifts)]
// compile-flags: -C overflow-checks=on -O

#![deny(const_err)]

Expand All @@ -23,7 +22,7 @@ fn main() {
let d = 42u8 - (42u8 + 1);
//~^ ERROR const_err
let _e = [5u8][1];
//~^ ERROR const_err
//~^ ERROR index out of bounds
black_box(a);
black_box(b);
black_box(c);
Expand Down
28 changes: 14 additions & 14 deletions src/test/ui/consts/const-err2.stderr
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
error: attempt to negate with overflow
--> $DIR/const-err2.rs:17:13
error: this expression will panic at runtime
--> $DIR/const-err2.rs:16:13
|
LL | let a = -std::i8::MIN;
| ^^^^^^^^^^^^^
| ^^^^^^^^^^^^^ attempt to negate with overflow
|
note: lint level defined here
--> $DIR/const-err2.rs:10:9
--> $DIR/const-err2.rs:9:9
|
LL | #![deny(const_err)]
| ^^^^^^^^^

error: attempt to add with overflow
--> $DIR/const-err2.rs:19:13
error: this expression will panic at runtime
--> $DIR/const-err2.rs:18:13
|
LL | let b = 200u8 + 200u8 + 200u8;
| ^^^^^^^^^^^^^
| ^^^^^^^^^^^^^ attempt to add with overflow

error: attempt to multiply with overflow
--> $DIR/const-err2.rs:21:13
error: this expression will panic at runtime
--> $DIR/const-err2.rs:20:13
|
LL | let c = 200u8 * 4;
| ^^^^^^^^^
| ^^^^^^^^^ attempt to multiply with overflow

error: attempt to subtract with overflow
--> $DIR/const-err2.rs:23:13
error: this expression will panic at runtime
--> $DIR/const-err2.rs:22:13
|
LL | let d = 42u8 - (42u8 + 1);
| ^^^^^^^^^^^^^^^^^
| ^^^^^^^^^^^^^^^^^ attempt to subtract with overflow

error: index out of bounds: the len is 1 but the index is 1
--> $DIR/const-err2.rs:25:14
--> $DIR/const-err2.rs:24:14
|
LL | let _e = [5u8][1];
| ^^^^^^^^
Expand Down
30 changes: 30 additions & 0 deletions src/test/ui/consts/const-err3.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// needed because negating int::MIN will behave differently between
// optimized compilation and unoptimized compilation and thus would
// lead to different lints being emitted
// compile-flags: -C overflow-checks=on -O

#![feature(rustc_attrs)]
#![allow(exceeding_bitshifts)]

#![deny(const_err)]

fn black_box<T>(_: T) {
unimplemented!()
}

fn main() {
let a = -std::i8::MIN;
//~^ ERROR const_err
let b = 200u8 + 200u8 + 200u8;
//~^ ERROR const_err
let c = 200u8 * 4;
//~^ ERROR const_err
let d = 42u8 - (42u8 + 1);
//~^ ERROR const_err
let _e = [5u8][1];
//~^ ERROR const_err
black_box(a);
black_box(b);
black_box(c);
black_box(d);
}
38 changes: 38 additions & 0 deletions src/test/ui/consts/const-err3.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
error: attempt to negate with overflow
--> $DIR/const-err3.rs:16:13
|
LL | let a = -std::i8::MIN;
| ^^^^^^^^^^^^^
|
note: lint level defined here
--> $DIR/const-err3.rs:9:9
|
LL | #![deny(const_err)]
| ^^^^^^^^^

error: attempt to add with overflow
--> $DIR/const-err3.rs:18:13
|
LL | let b = 200u8 + 200u8 + 200u8;
| ^^^^^^^^^^^^^

error: attempt to multiply with overflow
--> $DIR/const-err3.rs:20:13
|
LL | let c = 200u8 * 4;
| ^^^^^^^^^

error: attempt to subtract with overflow
--> $DIR/const-err3.rs:22:13
|
LL | let d = 42u8 - (42u8 + 1);
| ^^^^^^^^^^^^^^^^^

error: index out of bounds: the len is 1 but the index is 1
--> $DIR/const-err3.rs:24:14
|
LL | let _e = [5u8][1];
| ^^^^^^^^

error: aborting due to 5 previous errors

5 changes: 2 additions & 3 deletions src/test/ui/consts/const-eval/promoted_errors.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// compile-flags: -C overflow-checks=on -O
// compile-flags: -O

#![deny(const_err)]

fn main() {
println!("{}", 0u32 - 1);
//~^ ERROR attempt to subtract with overflow
let _x = 0u32 - 1;
//~^ ERROR attempt to subtract with overflow
//~^ ERROR const_err
println!("{}", 1/(1-1));
//~^ ERROR attempt to divide by zero [const_err]
//~| ERROR reaching this expression at runtime will panic or abort [const_err]
Expand Down
32 changes: 13 additions & 19 deletions src/test/ui/consts/const-eval/promoted_errors.stderr
Original file line number Diff line number Diff line change
@@ -1,68 +1,62 @@
error: attempt to subtract with overflow
--> $DIR/promoted_errors.rs:6:20
error: this expression will panic at runtime
--> $DIR/promoted_errors.rs:7:14
|
LL | println!("{}", 0u32 - 1);
| ^^^^^^^^
LL | let _x = 0u32 - 1;
| ^^^^^^^^ attempt to subtract with overflow
|
note: lint level defined here
--> $DIR/promoted_errors.rs:3:9
|
LL | #![deny(const_err)]
| ^^^^^^^^^

error: attempt to subtract with overflow
--> $DIR/promoted_errors.rs:8:14
|
LL | let _x = 0u32 - 1;
| ^^^^^^^^

error: attempt to divide by zero
--> $DIR/promoted_errors.rs:10:20
--> $DIR/promoted_errors.rs:9:20
|
LL | println!("{}", 1/(1-1));
| ^^^^^^^

error: reaching this expression at runtime will panic or abort
--> $DIR/promoted_errors.rs:10:20
--> $DIR/promoted_errors.rs:9:20
|
LL | println!("{}", 1/(1-1));
| ^^^^^^^ attempt to divide by zero

error: attempt to divide by zero
--> $DIR/promoted_errors.rs:13:14
--> $DIR/promoted_errors.rs:12:14
|
LL | let _x = 1/(1-1);
| ^^^^^^^

error: this expression will panic at runtime
--> $DIR/promoted_errors.rs:13:14
--> $DIR/promoted_errors.rs:12:14
|
LL | let _x = 1/(1-1);
| ^^^^^^^ attempt to divide by zero

error: attempt to divide by zero
--> $DIR/promoted_errors.rs:16:20
--> $DIR/promoted_errors.rs:15:20
|
LL | println!("{}", 1/(false as u32));
| ^^^^^^^^^^^^^^^^

error: reaching this expression at runtime will panic or abort
--> $DIR/promoted_errors.rs:16:20
--> $DIR/promoted_errors.rs:15:20
|
LL | println!("{}", 1/(false as u32));
| ^^^^^^^^^^^^^^^^ attempt to divide by zero

error: attempt to divide by zero
--> $DIR/promoted_errors.rs:19:14
--> $DIR/promoted_errors.rs:18:14
|
LL | let _x = 1/(false as u32);
| ^^^^^^^^^^^^^^^^

error: this expression will panic at runtime
--> $DIR/promoted_errors.rs:19:14
--> $DIR/promoted_errors.rs:18:14
|
LL | let _x = 1/(false as u32);
| ^^^^^^^^^^^^^^^^ attempt to divide by zero

error: aborting due to 10 previous errors
error: aborting due to 9 previous errors

22 changes: 22 additions & 0 deletions src/test/ui/consts/const-eval/promoted_errors2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// compile-flags: -C overflow-checks=on -O

#![deny(const_err)]

fn main() {
println!("{}", 0u32 - 1);
//~^ ERROR attempt to subtract with overflow
let _x = 0u32 - 1;
//~^ ERROR attempt to subtract with overflow
println!("{}", 1/(1-1));
//~^ ERROR attempt to divide by zero [const_err]
//~| ERROR reaching this expression at runtime will panic or abort [const_err]
let _x = 1/(1-1);
//~^ ERROR const_err
//~| ERROR const_err
println!("{}", 1/(false as u32));
//~^ ERROR attempt to divide by zero [const_err]
//~| ERROR reaching this expression at runtime will panic or abort [const_err]
let _x = 1/(false as u32);
//~^ ERROR const_err
//~| ERROR const_err
}
68 changes: 68 additions & 0 deletions src/test/ui/consts/const-eval/promoted_errors2.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
error: attempt to subtract with overflow
--> $DIR/promoted_errors2.rs:6:20
|
LL | println!("{}", 0u32 - 1);
| ^^^^^^^^
|
note: lint level defined here
--> $DIR/promoted_errors2.rs:3:9
|
LL | #![deny(const_err)]
| ^^^^^^^^^

error: attempt to subtract with overflow
--> $DIR/promoted_errors2.rs:8:14
|
LL | let _x = 0u32 - 1;
| ^^^^^^^^

error: attempt to divide by zero
--> $DIR/promoted_errors2.rs:10:20
|
LL | println!("{}", 1/(1-1));
| ^^^^^^^

error: reaching this expression at runtime will panic or abort
--> $DIR/promoted_errors2.rs:10:20
|
LL | println!("{}", 1/(1-1));
| ^^^^^^^ attempt to divide by zero

error: attempt to divide by zero
--> $DIR/promoted_errors2.rs:13:14
|
LL | let _x = 1/(1-1);
| ^^^^^^^

error: this expression will panic at runtime
--> $DIR/promoted_errors2.rs:13:14
|
LL | let _x = 1/(1-1);
| ^^^^^^^ attempt to divide by zero

error: attempt to divide by zero
--> $DIR/promoted_errors2.rs:16:20
|
LL | println!("{}", 1/(false as u32));
| ^^^^^^^^^^^^^^^^

error: reaching this expression at runtime will panic or abort
--> $DIR/promoted_errors2.rs:16:20
|
LL | println!("{}", 1/(false as u32));
| ^^^^^^^^^^^^^^^^ attempt to divide by zero

error: attempt to divide by zero
--> $DIR/promoted_errors2.rs:19:14
|
LL | let _x = 1/(false as u32);
| ^^^^^^^^^^^^^^^^

error: this expression will panic at runtime
--> $DIR/promoted_errors2.rs:19:14
|
LL | let _x = 1/(false as u32);
| ^^^^^^^^^^^^^^^^ attempt to divide by zero

error: aborting due to 10 previous errors

6 changes: 6 additions & 0 deletions src/test/ui/consts/issue-64059-2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// compile-flags: -C overflow-checks=on -O
// run-pass

fn main() {
let _ = -(-0.0);
}
1 change: 0 additions & 1 deletion src/test/ui/consts/issue-64059.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// compile-flags: -C overflow-checks=on -O
// run-pass

fn main() {
Expand Down
12 changes: 10 additions & 2 deletions src/test/ui/issues/issue-8460-const.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// compile-flags: -C overflow-checks=on -O

#![deny(const_err)]

use std::{isize, i8, i16, i32, i64};
Expand All @@ -8,14 +6,19 @@ use std::thread;
fn main() {
assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
//~^ ERROR attempt to divide by zero
//~| ERROR this expression will panic at runtime
Expand All @@ -33,14 +36,19 @@ fn main() {
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with a divisor of zero
//~| ERROR this expression will panic at runtime
Expand Down
Loading

0 comments on commit a937d8c

Please sign in to comment.