Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 23 deletions

diff --git a/src/test/ui/consts/auxiliary/promotable_const_fn_lib.rs b/src/test/ui/consts/auxiliary/promotable_const_fn_lib.rs
deleted file mode 100644
index b1d5440b4..000000000
--- a/src/test/ui/consts/auxiliary/promotable_const_fn_lib.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Crate that exports a const fn. Used for testing cross-crate.
-
-#![feature(staged_api, rustc_attrs)]
-#![stable(since="1.0.0", feature = "mep")]
-
-#![crate_type="rlib"]
-
-#[rustc_promotable]
-#[stable(since="1.0.0", feature = "mep")]
-#[rustc_const_stable(since="1.0.0", feature = "mep")]
-#[inline]
-pub const fn foo() -> usize { 22 }
-
-#[stable(since="1.0.0", feature = "mep")]
-pub struct Foo(usize);
-
-impl Foo {
-    #[stable(since="1.0.0", feature = "mep")]
-    #[rustc_const_stable(feature = "mep", since = "1.0.0")]
-    #[inline]
-    #[rustc_promotable]
-    pub const fn foo() -> usize { 22 }
-}