Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 27 deletions

diff --git a/src/test/mir-opt/inline/inline_trait_method_2.rs b/src/test/mir-opt/inline/inline_trait_method_2.rs
deleted file mode 100644
index 378e71a25..000000000
--- a/src/test/mir-opt/inline/inline_trait_method_2.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// compile-flags: -Z span_free_formats -Z mir-opt-level=4
-
-// EMIT_MIR inline_trait_method_2.test2.Inline.after.mir
-fn test2(x: &dyn X) -> bool {
-    test(x)
-}
-
-#[inline]
-fn test(x: &dyn X) -> bool {
-    x.y()
-}
-
-trait X {
-    fn y(&self) -> bool {
-        false
-    }
-}
-
-impl X for () {
-    fn y(&self) -> bool {
-        true
-    }
-}
-
-fn main() {
-    println!("Should be true: {}", test2(&()));
-}