Rollup merge of #130730 - veera-sivarajan:clean-test-headers, r=compiler-errors
Reorganize Test Headers This PR moves the test headers to the top in a couple of test files to maintain consistent style. Based on this comment: https://github.com/rust-lang/rust/pull/130665#discussion_r1770506261
This commit is contained in:
commit
ae43f27f83
@ -1,5 +1,5 @@
|
|||||||
warning: constant evaluation is taking a long time
|
warning: constant evaluation is taking a long time
|
||||||
--> $DIR/ctfe-simple-loop.rs:9:5
|
--> $DIR/ctfe-simple-loop.rs:10:5
|
||||||
|
|
|
|
||||||
LL | / while index < n {
|
LL | / while index < n {
|
||||||
LL | |
|
LL | |
|
||||||
@ -10,7 +10,7 @@ LL | | }
|
|||||||
| |_____^ the const evaluator is currently interpreting this expression
|
| |_____^ the const evaluator is currently interpreting this expression
|
||||||
|
|
|
|
||||||
help: the constant being evaluated
|
help: the constant being evaluated
|
||||||
--> $DIR/ctfe-simple-loop.rs:19:1
|
--> $DIR/ctfe-simple-loop.rs:20:1
|
||||||
|
|
|
|
||||||
LL | const Y: u32 = simple_loop(35);
|
LL | const Y: u32 = simple_loop(35);
|
||||||
| ^^^^^^^^^^^^
|
| ^^^^^^^^^^^^
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
//@ check-pass
|
//@ check-pass
|
||||||
//@ revisions: warn allow
|
//@ revisions: warn allow
|
||||||
|
//@ compile-flags: -Z tiny-const-eval-limit
|
||||||
|
|
||||||
#![cfg_attr(warn, warn(long_running_const_eval))]
|
#![cfg_attr(warn, warn(long_running_const_eval))]
|
||||||
#![cfg_attr(allow, allow(long_running_const_eval))]
|
#![cfg_attr(allow, allow(long_running_const_eval))]
|
||||||
|
|
||||||
//@ compile-flags: -Z tiny-const-eval-limit
|
|
||||||
const fn simple_loop(n: u32) -> u32 {
|
const fn simple_loop(n: u32) -> u32 {
|
||||||
let mut index = 0;
|
let mut index = 0;
|
||||||
while index < n {
|
while index < n {
|
||||||
|
@ -1,29 +1,5 @@
|
|||||||
warning: constant evaluation is taking a long time
|
warning: constant evaluation is taking a long time
|
||||||
--> $DIR/ctfe-simple-loop.rs:9:5
|
--> $DIR/ctfe-simple-loop.rs:10:5
|
||||||
|
|
|
||||||
LL | / while index < n {
|
|
||||||
LL | |
|
|
||||||
LL | |
|
|
||||||
LL | |
|
|
||||||
LL | | index = index + 1;
|
|
||||||
LL | | }
|
|
||||||
| |_____^
|
|
||||||
|
|
|
||||||
= note: this lint makes sure the compiler doesn't get stuck due to infinite loops in const eval.
|
|
||||||
If your compilation actually takes a long time, you can safely allow the lint.
|
|
||||||
help: the constant being evaluated
|
|
||||||
--> $DIR/ctfe-simple-loop.rs:18:1
|
|
||||||
|
|
|
||||||
LL | const X: u32 = simple_loop(19);
|
|
||||||
| ^^^^^^^^^^^^
|
|
||||||
note: the lint level is defined here
|
|
||||||
--> $DIR/ctfe-simple-loop.rs:3:24
|
|
||||||
|
|
|
||||||
LL | #![cfg_attr(warn, warn(long_running_const_eval))]
|
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
warning: constant evaluation is taking a long time
|
|
||||||
--> $DIR/ctfe-simple-loop.rs:9:5
|
|
||||||
|
|
|
|
||||||
LL | / while index < n {
|
LL | / while index < n {
|
||||||
LL | |
|
LL | |
|
||||||
@ -38,11 +14,35 @@ LL | | }
|
|||||||
help: the constant being evaluated
|
help: the constant being evaluated
|
||||||
--> $DIR/ctfe-simple-loop.rs:19:1
|
--> $DIR/ctfe-simple-loop.rs:19:1
|
||||||
|
|
|
|
||||||
|
LL | const X: u32 = simple_loop(19);
|
||||||
|
| ^^^^^^^^^^^^
|
||||||
|
note: the lint level is defined here
|
||||||
|
--> $DIR/ctfe-simple-loop.rs:5:24
|
||||||
|
|
|
||||||
|
LL | #![cfg_attr(warn, warn(long_running_const_eval))]
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
warning: constant evaluation is taking a long time
|
||||||
|
--> $DIR/ctfe-simple-loop.rs:10:5
|
||||||
|
|
|
||||||
|
LL | / while index < n {
|
||||||
|
LL | |
|
||||||
|
LL | |
|
||||||
|
LL | |
|
||||||
|
LL | | index = index + 1;
|
||||||
|
LL | | }
|
||||||
|
| |_____^
|
||||||
|
|
|
||||||
|
= note: this lint makes sure the compiler doesn't get stuck due to infinite loops in const eval.
|
||||||
|
If your compilation actually takes a long time, you can safely allow the lint.
|
||||||
|
help: the constant being evaluated
|
||||||
|
--> $DIR/ctfe-simple-loop.rs:20:1
|
||||||
|
|
|
||||||
LL | const Y: u32 = simple_loop(35);
|
LL | const Y: u32 = simple_loop(35);
|
||||||
| ^^^^^^^^^^^^
|
| ^^^^^^^^^^^^
|
||||||
|
|
||||||
warning: constant evaluation is taking a long time
|
warning: constant evaluation is taking a long time
|
||||||
--> $DIR/ctfe-simple-loop.rs:9:5
|
--> $DIR/ctfe-simple-loop.rs:10:5
|
||||||
|
|
|
|
||||||
LL | / while index < n {
|
LL | / while index < n {
|
||||||
LL | |
|
LL | |
|
||||||
@ -53,7 +53,7 @@ LL | | }
|
|||||||
| |_____^ the const evaluator is currently interpreting this expression
|
| |_____^ the const evaluator is currently interpreting this expression
|
||||||
|
|
|
|
||||||
help: the constant being evaluated
|
help: the constant being evaluated
|
||||||
--> $DIR/ctfe-simple-loop.rs:19:1
|
--> $DIR/ctfe-simple-loop.rs:20:1
|
||||||
|
|
|
|
||||||
LL | const Y: u32 = simple_loop(35);
|
LL | const Y: u32 = simple_loop(35);
|
||||||
| ^^^^^^^^^^^^
|
| ^^^^^^^^^^^^
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
//@ check-pass
|
//@ check-pass
|
||||||
|
//@ compile-flags: -Z tiny-const-eval-limit -Z deduplicate-diagnostics=yes
|
||||||
|
|
||||||
#![allow(long_running_const_eval)]
|
#![allow(long_running_const_eval)]
|
||||||
|
|
||||||
//@ compile-flags: -Z tiny-const-eval-limit -Z deduplicate-diagnostics=yes
|
|
||||||
const FOO: () = {
|
const FOO: () = {
|
||||||
let mut i = 0;
|
let mut i = 0;
|
||||||
loop {
|
loop {
|
||||||
|
Loading…
Reference in New Issue
Block a user