Merge from rustc

20 files changed, 21 insertions, 21 deletions

diff --git a/tests/ui/inline-const/const-expr-array-init.rs b/tests/ui/inline-const/const-expr-array-init.rs
index 8a92cdbc0f9..075c27c1cc9 100644
--- a/tests/ui/inline-const/const-expr-array-init.rs
+++ b/tests/ui/inline-const/const-expr-array-init.rs
@@ -1,4 +1,4 @@
-// build-pass
+//@ build-pass
 
 #![feature(inline_const)]
 
diff --git a/tests/ui/inline-const/const-expr-basic.rs b/tests/ui/inline-const/const-expr-basic.rs
index dac46fe25ec..6a19cc656d0 100644
--- a/tests/ui/inline-const/const-expr-basic.rs
+++ b/tests/ui/inline-const/const-expr-basic.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(inline_const)]
 
diff --git a/tests/ui/inline-const/const-expr-generic-err.rs b/tests/ui/inline-const/const-expr-generic-err.rs
index 4e8879af54a..3c4bbcb3dc9 100644
--- a/tests/ui/inline-const/const-expr-generic-err.rs
+++ b/tests/ui/inline-const/const-expr-generic-err.rs
@@ -1,4 +1,4 @@
-// build-fail
+//@ build-fail
 #![feature(inline_const)]
 
 fn foo<T>() {
diff --git a/tests/ui/inline-const/const-expr-generic.rs b/tests/ui/inline-const/const-expr-generic.rs
index 3207bfa0e89..e634e1d4a47 100644
--- a/tests/ui/inline-const/const-expr-generic.rs
+++ b/tests/ui/inline-const/const-expr-generic.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![feature(inline_const)]
 
 fn foo<T>() -> usize {
diff --git a/tests/ui/inline-const/const-expr-inference.rs b/tests/ui/inline-const/const-expr-inference.rs
index 0d5892a74d9..f3b97d3430e 100644
--- a/tests/ui/inline-const/const-expr-inference.rs
+++ b/tests/ui/inline-const/const-expr-inference.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![feature(inline_const)]
 
diff --git a/tests/ui/inline-const/const-expr-lifetime.rs b/tests/ui/inline-const/const-expr-lifetime.rs
index d883deb2845..5dac17645d7 100644
--- a/tests/ui/inline-const/const-expr-lifetime.rs
+++ b/tests/ui/inline-const/const-expr-lifetime.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(const_mut_refs)]
 #![feature(inline_const)]
diff --git a/tests/ui/inline-const/const-expr-macro.rs b/tests/ui/inline-const/const-expr-macro.rs
index 041f3e15a29..bf3cb3c3320 100644
--- a/tests/ui/inline-const/const-expr-macro.rs
+++ b/tests/ui/inline-const/const-expr-macro.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(inline_const)]
 
diff --git a/tests/ui/inline-const/const-expr-reference.rs b/tests/ui/inline-const/const-expr-reference.rs
index a54d879f69d..b3753b0d371 100644
--- a/tests/ui/inline-const/const-expr-reference.rs
+++ b/tests/ui/inline-const/const-expr-reference.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(inline_const)]
 
diff --git a/tests/ui/inline-const/const-match-pat-inference.rs b/tests/ui/inline-const/const-match-pat-inference.rs
index c595824833f..3d3533839bc 100644
--- a/tests/ui/inline-const/const-match-pat-inference.rs
+++ b/tests/ui/inline-const/const-match-pat-inference.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![feature(inline_const_pat)]
 
diff --git a/tests/ui/inline-const/const-match-pat-lifetime.rs b/tests/ui/inline-const/const-match-pat-lifetime.rs
index 595741b101e..f909e68e7be 100644
--- a/tests/ui/inline-const/const-match-pat-lifetime.rs
+++ b/tests/ui/inline-const/const-match-pat-lifetime.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(const_mut_refs)]
 #![feature(inline_const)]
diff --git a/tests/ui/inline-const/const-match-pat-range.rs b/tests/ui/inline-const/const-match-pat-range.rs
index 0f9372c537f..7f51815cb77 100644
--- a/tests/ui/inline-const/const-match-pat-range.rs
+++ b/tests/ui/inline-const/const-match-pat-range.rs
@@ -1,4 +1,4 @@
-// build-pass
+//@ build-pass
 
 #![feature(inline_const_pat, exclusive_range_pattern)]
 
diff --git a/tests/ui/inline-const/const-match-pat.rs b/tests/ui/inline-const/const-match-pat.rs
index fc4d3771458..1580ef25812 100644
--- a/tests/ui/inline-const/const-match-pat.rs
+++ b/tests/ui/inline-const/const-match-pat.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(inline_const_pat)]
 const MMIO_BIT1: u8 = 4;
diff --git a/tests/ui/inline-const/elided-lifetime-being-infer-vars.rs b/tests/ui/inline-const/elided-lifetime-being-infer-vars.rs
index 5661db4a253..a1c3c61484a 100644
--- a/tests/ui/inline-const/elided-lifetime-being-infer-vars.rs
+++ b/tests/ui/inline-const/elided-lifetime-being-infer-vars.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![feature(inline_const)]
 
diff --git a/tests/ui/inline-const/expr-unsafe.rs b/tests/ui/inline-const/expr-unsafe.rs
index 2370c58a712..f9d1450503e 100644
--- a/tests/ui/inline-const/expr-unsafe.rs
+++ b/tests/ui/inline-const/expr-unsafe.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![warn(unused_unsafe)]
 #![feature(inline_const)]
diff --git a/tests/ui/inline-const/expr-with-block.rs b/tests/ui/inline-const/expr-with-block.rs
index 391872476fc..07a1c9a10f5 100644
--- a/tests/ui/inline-const/expr-with-block.rs
+++ b/tests/ui/inline-const/expr-with-block.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 #![feature(inline_const)]
 fn main() {
     match true {
diff --git a/tests/ui/inline-const/instance-doesnt-depend-on-type.rs b/tests/ui/inline-const/instance-doesnt-depend-on-type.rs
index bc739785c8b..17208a23088 100644
--- a/tests/ui/inline-const/instance-doesnt-depend-on-type.rs
+++ b/tests/ui/inline-const/instance-doesnt-depend-on-type.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 // issue: 114660
 
 #![feature(inline_const)]
diff --git a/tests/ui/inline-const/interpolated.rs b/tests/ui/inline-const/interpolated.rs
index 3fcc621c946..582900e7aa0 100644
--- a/tests/ui/inline-const/interpolated.rs
+++ b/tests/ui/inline-const/interpolated.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![feature(inline_const)]
 
diff --git a/tests/ui/inline-const/macro-with-const.rs b/tests/ui/inline-const/macro-with-const.rs
index e7393166d8d..ba75a28f736 100644
--- a/tests/ui/inline-const/macro-with-const.rs
+++ b/tests/ui/inline-const/macro-with-const.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 macro_rules! exp {
     (const $n:expr) => {
diff --git a/tests/ui/inline-const/pat-unsafe.rs b/tests/ui/inline-const/pat-unsafe.rs
index 5a90920ef3c..4b05f3a1cdd 100644
--- a/tests/ui/inline-const/pat-unsafe.rs
+++ b/tests/ui/inline-const/pat-unsafe.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 
 #![warn(unused_unsafe)]
 #![feature(inline_const_pat)]
diff --git a/tests/ui/inline-const/required-const.rs b/tests/ui/inline-const/required-const.rs
index 0483410662b..3de0ab2a0c0 100644
--- a/tests/ui/inline-const/required-const.rs
+++ b/tests/ui/inline-const/required-const.rs
@@ -1,5 +1,5 @@
-// build-fail
-// compile-flags: -Zmir-opt-level=3
+//@ build-fail
+//@ compile-flags: -Zmir-opt-level=3
 #![feature(inline_const)]
 
 fn foo<T>() {