From 8cf861db3a396b56eaabdb928b88b933056ae2a1 Mon Sep 17 00:00:00 2001
From: Veera <sveera.2001@gmail.com>
Date: Sun, 22 Sep 2024 21:43:46 -0400
Subject: [PATCH] Reorganize Test Headers

---
 .../stable-metric/ctfe-simple-loop.allow.stderr    |  4 ++--
 .../const-eval/stable-metric/ctfe-simple-loop.rs   |  3 ++-
 .../stable-metric/ctfe-simple-loop.warn.stderr     | 14 +++++++-------
 .../evade-deduplication-issue-118612.rs            |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.allow.stderr b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.allow.stderr
index 30550f93ac10d..7f6625bcfcdc6 100644
--- a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.allow.stderr
+++ b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.allow.stderr
@@ -1,5 +1,5 @@
 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 | |
@@ -10,7 +10,7 @@ LL | |     }
    | |_____^ the const evaluator is currently interpreting this expression
    |
 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);
    | ^^^^^^^^^^^^
diff --git a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.rs b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.rs
index 42b93383c2b52..7fa338f025a7b 100644
--- a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.rs
+++ b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.rs
@@ -1,9 +1,10 @@
 //@ check-pass
 //@ revisions: warn allow
+//@ compile-flags: -Z tiny-const-eval-limit
+
 #![cfg_attr(warn, warn(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 {
     let mut index = 0;
     while index < n {
diff --git a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.warn.stderr b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.warn.stderr
index 40fc4a876e9e5..657f0e5bcba40 100644
--- a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.warn.stderr
+++ b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.warn.stderr
@@ -1,5 +1,5 @@
 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 | |
@@ -12,18 +12,18 @@ 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
+  --> $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:3:24
+  --> $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:9:5
+  --> $DIR/ctfe-simple-loop.rs:10:5
    |
 LL | /     while index < n {
 LL | |
@@ -36,13 +36,13 @@ 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:19:1
+  --> $DIR/ctfe-simple-loop.rs:20:1
    |
 LL | const Y: u32 = simple_loop(35);
    | ^^^^^^^^^^^^
 
 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 | |
@@ -53,7 +53,7 @@ LL | |     }
    | |_____^ the const evaluator is currently interpreting this expression
    |
 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);
    | ^^^^^^^^^^^^
diff --git a/tests/ui/consts/const-eval/stable-metric/evade-deduplication-issue-118612.rs b/tests/ui/consts/const-eval/stable-metric/evade-deduplication-issue-118612.rs
index a2d34eaa384c9..43b14bae56f4b 100644
--- a/tests/ui/consts/const-eval/stable-metric/evade-deduplication-issue-118612.rs
+++ b/tests/ui/consts/const-eval/stable-metric/evade-deduplication-issue-118612.rs
@@ -1,8 +1,8 @@
 //@ check-pass
+//@ compile-flags: -Z tiny-const-eval-limit -Z deduplicate-diagnostics=yes
 
 #![allow(long_running_const_eval)]
 
-//@ compile-flags: -Z tiny-const-eval-limit -Z deduplicate-diagnostics=yes
 const FOO: () = {
     let mut i = 0;
     loop {