Merging upstream version 1.67.1+dfsg1.

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

1 files changed, 0 insertions, 19 deletions

diff --git a/src/test/mir-opt/inline/inline-options.rs b/src/test/mir-opt/inline/inline-options.rs
deleted file mode 100644
index 477f050b6..000000000
--- a/src/test/mir-opt/inline/inline-options.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Checks that inlining threshold can be controlled with
-// inline-mir-threshold and inline-hint-threshold options.
-//
-// compile-flags: -Zinline-mir-threshold=90
-// compile-flags: -Zinline-mir-hint-threshold=50
-
-// EMIT_MIR inline_options.main.Inline.after.mir
-fn main() {
-    not_inlined();
-    inlined::<u32>();
-}
-
-// Cost is approximately 3 * 25 + 5 = 80.
-#[inline]
-pub fn not_inlined() { g(); g(); g(); }
-pub fn inlined<T>() { g(); g(); g(); }
-
-#[inline(never)]
-fn g() {}