From cd25009469926abec4b1104396ef99026a6b9b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?=
 <jieyouxu@outlook.com>
Date: Wed, 21 Feb 2024 12:37:58 +0000
Subject: [PATCH] Re-bless tests/pretty

---
 tests/pretty/asm.pp                           | 6 +++---
 tests/pretty/block-comment-wchar.pp           | 2 +-
 tests/pretty/cast-lt.pp                       | 6 +++---
 tests/pretty/dollar-crate.pp                  | 6 +++---
 tests/pretty/example2.pp                      | 2 +-
 tests/pretty/expanded-and-path-remap-80832.pp | 6 +++---
 tests/pretty/format-args-str-escape.pp        | 6 +++---
 tests/pretty/hir-fn-variadic.pp               | 6 +++---
 tests/pretty/hir-pretty-loop.pp               | 6 +++---
 tests/pretty/issue-12590-c.pp                 | 6 +++---
 tests/pretty/issue-31073.pp                   | 2 +-
 tests/pretty/issue-4264.pp                    | 6 +++---
 tests/pretty/issue-85089.pp                   | 6 +++---
 tests/pretty/tests-are-sorted.pp              | 8 ++++----
 tests/pretty/vec-comments.pp                  | 2 +-
 15 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/tests/pretty/asm.pp b/tests/pretty/asm.pp
index 5eade2933b8..e6c9545f51e 100644
--- a/tests/pretty/asm.pp
+++ b/tests/pretty/asm.pp
@@ -4,9 +4,9 @@
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-// pretty-mode:expanded
-// pp-exact:asm.pp
-// only-x86_64
+//@ pretty-mode:expanded
+//@ pp-exact:asm.pp
+//@ only-x86_64
 
 use std::arch::asm;
 
diff --git a/tests/pretty/block-comment-wchar.pp b/tests/pretty/block-comment-wchar.pp
index 9d64fb4156c..863fe686d7d 100644
--- a/tests/pretty/block-comment-wchar.pp
+++ b/tests/pretty/block-comment-wchar.pp
@@ -3,7 +3,7 @@
 // Test via: rustc -Zunpretty normal tests/pretty/block-comment-wchar.rs
 // ignore-tidy-cr
 // ignore-tidy-tab
-// pp-exact:block-comment-wchar.pp
+//@ pp-exact:block-comment-wchar.pp
 fn f() {
     fn nested() {
         /*
diff --git a/tests/pretty/cast-lt.pp b/tests/pretty/cast-lt.pp
index 61cd8f59712..f6155c9d827 100644
--- a/tests/pretty/cast-lt.pp
+++ b/tests/pretty/cast-lt.pp
@@ -4,9 +4,9 @@
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-// pretty-compare-only
-// pretty-mode:expanded
-// pp-exact:cast-lt.pp
+//@ pretty-compare-only
+//@ pretty-mode:expanded
+//@ pp-exact:cast-lt.pp
 
 macro_rules! negative { ($e:expr) => { $e < 0 } }
 
diff --git a/tests/pretty/dollar-crate.pp b/tests/pretty/dollar-crate.pp
index 60fddb630d9..561a9500aaa 100644
--- a/tests/pretty/dollar-crate.pp
+++ b/tests/pretty/dollar-crate.pp
@@ -4,8 +4,8 @@
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-// pretty-compare-only
-// pretty-mode:expanded
-// pp-exact:dollar-crate.pp
+//@ pretty-compare-only
+//@ pretty-mode:expanded
+//@ pp-exact:dollar-crate.pp
 
 fn main() { { ::std::io::_print(format_args!("rust\n")); }; }
diff --git a/tests/pretty/example2.pp b/tests/pretty/example2.pp
index 3f7129afde2..2524382e2b5 100644
--- a/tests/pretty/example2.pp
+++ b/tests/pretty/example2.pp
@@ -1,3 +1,3 @@
-// pp-exact:example2.pp
+//@ pp-exact:example2.pp
 
 fn main() {}
diff --git a/tests/pretty/expanded-and-path-remap-80832.pp b/tests/pretty/expanded-and-path-remap-80832.pp
index 8385c5fa8c9..5b3922bb329 100644
--- a/tests/pretty/expanded-and-path-remap-80832.pp
+++ b/tests/pretty/expanded-and-path-remap-80832.pp
@@ -6,8 +6,8 @@ use ::std::prelude::rust_2015::*;
 extern crate std;
 // Test for issue 80832
 //
-// pretty-mode:expanded
-// pp-exact:expanded-and-path-remap-80832.pp
-// compile-flags: --remap-path-prefix {{src-base}}=the/src
+//@ pretty-mode:expanded
+//@ pp-exact:expanded-and-path-remap-80832.pp
+//@ compile-flags: --remap-path-prefix {{src-base}}=the/src
 
 fn main() {}
diff --git a/tests/pretty/format-args-str-escape.pp b/tests/pretty/format-args-str-escape.pp
index b84bc2303b7..277b608475c 100644
--- a/tests/pretty/format-args-str-escape.pp
+++ b/tests/pretty/format-args-str-escape.pp
@@ -4,9 +4,9 @@
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-// pretty-compare-only
-// pretty-mode:expanded
-// pp-exact:format-args-str-escape.pp
+//@ pretty-compare-only
+//@ pretty-mode:expanded
+//@ pp-exact:format-args-str-escape.pp
 
 fn main() {
     { ::std::io::_print(format_args!("\u{1b}[1mHello, world!\u{1b}[0m\n")); };
diff --git a/tests/pretty/hir-fn-variadic.pp b/tests/pretty/hir-fn-variadic.pp
index 577d9400ad4..978e65c825b 100644
--- a/tests/pretty/hir-fn-variadic.pp
+++ b/tests/pretty/hir-fn-variadic.pp
@@ -1,6 +1,6 @@
-// pretty-compare-only
-// pretty-mode:hir
-// pp-exact:hir-fn-variadic.pp
+//@ pretty-compare-only
+//@ pretty-mode:hir
+//@ pp-exact:hir-fn-variadic.pp
 
 #![feature(c_variadic)]
 #[prelude_import]
diff --git a/tests/pretty/hir-pretty-loop.pp b/tests/pretty/hir-pretty-loop.pp
index a59a3002c7f..15f1677885a 100644
--- a/tests/pretty/hir-pretty-loop.pp
+++ b/tests/pretty/hir-pretty-loop.pp
@@ -2,8 +2,8 @@
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-// pretty-compare-only
-// pretty-mode:hir
-// pp-exact:hir-pretty-loop.pp
+//@ pretty-compare-only
+//@ pretty-mode:hir
+//@ pp-exact:hir-pretty-loop.pp
 
 fn foo() { loop { break; } }
diff --git a/tests/pretty/issue-12590-c.pp b/tests/pretty/issue-12590-c.pp
index 07b3f5653d3..691738a89ed 100644
--- a/tests/pretty/issue-12590-c.pp
+++ b/tests/pretty/issue-12590-c.pp
@@ -4,9 +4,9 @@
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-// pretty-compare-only
-// pretty-mode:expanded
-// pp-exact:issue-12590-c.pp
+//@ pretty-compare-only
+//@ pretty-mode:expanded
+//@ pp-exact:issue-12590-c.pp
 
 // The next line should be expanded
 
diff --git a/tests/pretty/issue-31073.pp b/tests/pretty/issue-31073.pp
index 75795f6d568..b3f8c6ce5da 100644
--- a/tests/pretty/issue-31073.pp
+++ b/tests/pretty/issue-31073.pp
@@ -1,4 +1,4 @@
-// pp-exact:issue-31073.pp
+//@ pp-exact:issue-31073.pp
 
 fn main() {
     fn f1(x: i32, y: i32) -> i32 { y }
diff --git a/tests/pretty/issue-4264.pp b/tests/pretty/issue-4264.pp
index 2d713832dcd..af64260d020 100644
--- a/tests/pretty/issue-4264.pp
+++ b/tests/pretty/issue-4264.pp
@@ -2,9 +2,9 @@
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-// pretty-compare-only
-// pretty-mode:hir,typed
-// pp-exact:issue-4264.pp
+//@ pretty-compare-only
+//@ pretty-mode:hir,typed
+//@ pp-exact:issue-4264.pp
 
 // #4264 fixed-length vector types
 
diff --git a/tests/pretty/issue-85089.pp b/tests/pretty/issue-85089.pp
index f84e9df04a2..f4e0eb3dd5f 100644
--- a/tests/pretty/issue-85089.pp
+++ b/tests/pretty/issue-85089.pp
@@ -4,9 +4,9 @@ use ::std::prelude::rust_2015::*;
 extern crate std;
 // Test to print lifetimes on HIR pretty-printing.
 
-// pretty-compare-only
-// pretty-mode:hir
-// pp-exact:issue-85089.pp
+//@ pretty-compare-only
+//@ pretty-mode:hir
+//@ pp-exact:issue-85089.pp
 
 trait A<'x> { }
 trait B<'x> { }
diff --git a/tests/pretty/tests-are-sorted.pp b/tests/pretty/tests-are-sorted.pp
index fbdad0c323f..816cd5a5c07 100644
--- a/tests/pretty/tests-are-sorted.pp
+++ b/tests/pretty/tests-are-sorted.pp
@@ -4,10 +4,10 @@
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-// compile-flags: --crate-type=lib --test --remap-path-prefix={{src-base}}/=/the/src/ --remap-path-prefix={{src-base}}\=/the/src/
-// pretty-compare-only
-// pretty-mode:expanded
-// pp-exact:tests-are-sorted.pp
+//@ compile-flags: --crate-type=lib --test --remap-path-prefix={{src-base}}/=/the/src/ --remap-path-prefix={{src-base}}\=/the/src/
+//@ pretty-compare-only
+//@ pretty-mode:expanded
+//@ pp-exact:tests-are-sorted.pp
 
 extern crate test;
 #[cfg(test)]
diff --git a/tests/pretty/vec-comments.pp b/tests/pretty/vec-comments.pp
index f2f807c59de..04189589a38 100644
--- a/tests/pretty/vec-comments.pp
+++ b/tests/pretty/vec-comments.pp
@@ -1,6 +1,6 @@
 // Issue #679
 // Testing that comments are correctly interleaved
-// pp-exact:vec-comments.pp
+//@ pp-exact:vec-comments.pp
 fn main() {
     let _v1 =
         [