Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 31 deletions

diff --git a/src/test/ui/consts/const-eval/issue-51300.rs b/src/test/ui/consts/const-eval/issue-51300.rs
deleted file mode 100644
index 8e68e8c91..000000000
--- a/src/test/ui/consts/const-eval/issue-51300.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// check-pass
-// https://github.com/rust-lang/rust/issues/51300
-
-#[derive(PartialEq, Eq, Clone, Copy)]
-pub struct Stat {
-    pub id: u8,
-    pub index: usize,
-}
-
-impl Stat {
-    pub const STUDENT_HAPPINESS: Stat = Stat{
-        id: 0,
-        index: 0,
-    };
-    pub const STUDENT_HUNGER: Stat = Stat{
-        id: 0,
-        index: Self::STUDENT_HAPPINESS.index + 1,
-    };
-
-}
-
-pub fn from_index(id: u8, index: usize) -> Option<Stat> {
-    let stat = Stat{id, index};
-    match stat {
-        Stat::STUDENT_HAPPINESS => Some(Stat::STUDENT_HAPPINESS),
-        Stat::STUDENT_HUNGER => Some(Stat::STUDENT_HUNGER),
-        _ => None,
-    }
-}
-
-fn main() { }