Auto merge of #57880 - Zoxc:error-on-cycle, r=michaelwoerister

Always emit an error for a query cycle

r? @michaelwoerister

cc @nikomatsakis @wesleywiser

3 files changed, 14 insertions, 14 deletions

diff --git a/src/test/mir-opt/inline-any-operand.rs b/src/test/mir-opt/inline-any-operand.rs
index 5fafc2c50ca..b5455003719 100644
--- a/src/test/mir-opt/inline-any-operand.rs
+++ b/src/test/mir-opt/inline-any-operand.rs
@@ -6,16 +6,16 @@ fn main() {
     println!("{}", bar());
 }
 
-#[inline(always)]
-fn foo(x: i32, y: i32) -> bool {
-    x == y
-}
-
 fn bar() -> bool {
     let f = foo;
     f(1, -1)
 }
 
+#[inline(always)]
+fn foo(x: i32, y: i32) -> bool {
+    x == y
+}
+
 // END RUST SOURCE
 // START rustc.bar.Inline.after.mir
 // ...
diff --git a/src/test/mir-opt/inline-retag.rs b/src/test/mir-opt/inline-retag.rs
index e91a5c22351..6cdbcfdb0ad 100644
--- a/src/test/mir-opt/inline-retag.rs
+++ b/src/test/mir-opt/inline-retag.rs
@@ -6,16 +6,16 @@ fn main() {
     println!("{}", bar());
 }
 
-#[inline(always)]
-fn foo(x: &i32, y: &i32) -> bool {
-    *x == *y
-}
-
 fn bar() -> bool {
     let f = foo;
     f(&1, &-1)
 }
 
+#[inline(always)]
+fn foo(x: &i32, y: &i32) -> bool {
+    *x == *y
+}
+
 // END RUST SOURCE
 // START rustc.bar.Inline.after.mir
 // ...
diff --git a/src/test/mir-opt/inline-trait-method_2.rs b/src/test/mir-opt/inline-trait-method_2.rs
index aa756f4a233..8f9f2535aa5 100644
--- a/src/test/mir-opt/inline-trait-method_2.rs
+++ b/src/test/mir-opt/inline-trait-method_2.rs
@@ -1,14 +1,14 @@
 // compile-flags: -Z span_free_formats -Z mir-opt-level=3
 
+fn test2(x: &dyn X) -> bool {
+    test(x)
+}
+
 #[inline]
 fn test(x: &dyn X) -> bool {
     x.y()
 }
 
-fn test2(x: &dyn X) -> bool {
-    test(x)
-}
-
 trait X {
     fn y(&self) -> bool {
         false