user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update const-eval tests

Browse source
This commit is contained in:
Dylan MacKenzie 2020-03-17 16:08:28 -07:00
parent e15c486728
commit 044dc6e8dd
7 changed files with 49 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/test/ui/consts/const-eval/infinite_loop.rs
View file

@ -2,7 +2,6 @@ fn main() {
// Tests the Collatz conjecture with an incorrect base case (0 instead of 1).
// The value of `n` will loop indefinitely (4 - 2 - 1 - 4).
let _ = [(); {
//~^ WARNING Constant evaluating a complex constant, this might take some time
let mut n = 113383; // #20 in https://oeis.org/A006884
while n != 0 {
//~^ ERROR `while` is not allowed in a `const`

21
src/test/ui/consts/const-eval/infinite_loop.stderr
View file

@ -1,5 +1,5 @@
error[E0658]: `while` is not allowed in a `const`
--> $DIR/infinite_loop.rs:7:9
--> $DIR/infinite_loop.rs:6:9
|
LL | / while n != 0 {
LL | |
@ -14,7 +14,7 @@ LL | | }
= help: add `#![feature(const_if_match)]` to the crate attributes to enable
error[E0658]: `if` is not allowed in a `const`
--> $DIR/infinite_loop.rs:9:17
--> $DIR/infinite_loop.rs:8:17
|
LL | n = if n % 2 == 0 { n/2 } else { 3*n + 1 };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -22,24 +22,11 @@ LL | n = if n % 2 == 0 { n/2 } else { 3*n + 1 };
= note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
= help: add `#![feature(const_if_match)]` to the crate attributes to enable
warning: Constant evaluating a complex constant, this might take some time
--> $DIR/infinite_loop.rs:4:18
|
LL | let _ = [(); {
| __________________^
LL | |
LL | | let mut n = 113383; // #20 in https://oeis.org/A006884
LL | | while n != 0 {
... |
LL | | n
LL | | }];
| |_____^
error[E0080]: evaluation of constant value failed
--> $DIR/infinite_loop.rs:9:20
--> $DIR/infinite_loop.rs:8:20
|
LL | n = if n % 2 == 0 { n/2 } else { 3*n + 1 };
| ^^^^^^^^^^ duplicate interpreter state observed here, const evaluation will never terminate
| ^^^^^^^^^^ exceeded interpreter time limit
error: aborting due to 3 previous errors

1
src/test/ui/consts/const-eval/issue-52475.rs
View file

@ -1,6 +1,5 @@
fn main() {
let _ = [(); {
//~^ WARNING Constant evaluating a complex constant, this might take some time
let mut x = &0;
let mut n = 0;
while n < 5 {

19
src/test/ui/consts/const-eval/issue-52475.stderr
View file

@ -1,5 +1,5 @@
error[E0658]: `while` is not allowed in a `const`
--> $DIR/issue-52475.rs:6:9
--> $DIR/issue-52475.rs:5:9
|
LL | / while n < 5 {
LL | |
@ -12,24 +12,11 @@ LL | | }
= help: add `#![feature(const_loop)]` to the crate attributes to enable
= help: add `#![feature(const_if_match)]` to the crate attributes to enable
warning: Constant evaluating a complex constant, this might take some time
--> $DIR/issue-52475.rs:2:18
|
LL | let _ = [(); {
| __________________^
LL | |
LL | | let mut x = &0;
LL | | let mut n = 0;
... |
LL | | 0
LL | | }];
| |_____^
error[E0080]: evaluation of constant value failed
--> $DIR/issue-52475.rs:8:17
--> $DIR/issue-52475.rs:7:17
|
LL | n = (n + 1) % 5;
| ^^^^^^^^^^^ duplicate interpreter state observed here, const evaluation will never terminate
| ^^^^^^^^^^^ exceeded interpreter time limit
error: aborting due to 2 previous errors

26
src/test/ui/consts/const_limit/const_eval_limit_not_reached.rs
View file

@ -1,15 +1,21 @@
// check-pass
#![feature(const_eval_limit)]
#![const_eval_limit="1000"]
const CONSTANT: usize = limit();
#![feature(const_eval_limit)]
#![feature(const_loop, const_if_match)]
// This needs to be higher than the number of loop iterations since each pass through the loop may
// hit more than one terminator.
#![const_eval_limit="4000"]
const X: usize = {
let mut x = 0;
while x != 1000 {
x += 1;
}
x
};
fn main() {
assert_eq!(CONSTANT, 1764);
}
const fn limit() -> usize {
let x = 42;
x * 42
assert_eq!(X, 1000);
}

29
src/test/ui/consts/const_limit/const_eval_limit_reached.rs
View file

@ -1,21 +1,18 @@
// ignore-tidy-linelength
// only-x86_64
// check-pass
// NOTE: We always compile this test with -Copt-level=0 because higher opt-levels
// optimize away the const function
// compile-flags:-Copt-level=0
#![feature(const_eval_limit)]
#![const_eval_limit="2"]
#![feature(const_loop, const_if_match)]
const CONSTANT: usize = limit();
//~^ WARNING Constant evaluating a complex constant, this might take some time
#![const_eval_limit="500"]
const X: usize = {
let mut x = 0;
while x != 1000 {
//~^ ERROR any use of this value will cause an error
x += 1;
}
x
};
fn main() {
assert_eq!(CONSTANT, 1764);
}
const fn limit() -> usize { //~ WARNING Constant evaluating a complex constant, this might take some time
let x = 42;
x * 42
assert_eq!(X, 1000);
}

25
src/test/ui/consts/const_limit/const_eval_limit_reached.stderr
View file

@ -1,16 +1,17 @@
warning: Constant evaluating a complex constant, this might take some time
--> $DIR/const_eval_limit_reached.rs:17:1
error: any use of this value will cause an error
--> $DIR/const_eval_limit_reached.rs:8:11
|
LL | / const fn limit() -> usize {
LL | | let x = 42;
LL | / const X: usize = {
LL | | let mut x = 0;
LL | | while x != 1000 {
| | ^^^^^^^^^ exceeded interpreter time limit
LL | |
LL | | x * 42
LL | | }
| |_^
warning: Constant evaluating a complex constant, this might take some time
--> $DIR/const_eval_limit_reached.rs:10:1
... |
LL | | x
LL | | };
| |__-
|
LL | const CONSTANT: usize = limit();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: `#[deny(const_err)]` on by default
error: aborting due to previous error