Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 16 deletions

diff --git a/src/test/ui/consts/const-eval/duration_conversion.rs b/src/test/ui/consts/const-eval/duration_conversion.rs
deleted file mode 100644
index 87b12937d..000000000
--- a/src/test/ui/consts/const-eval/duration_conversion.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// check-pass
-
-use std::time::Duration;
-
-fn main() {
-    const _ONE_SECOND: Duration = Duration::from_nanos(1_000_000_000);
-    const _ONE_MILLISECOND: Duration = Duration::from_nanos(1_000_000);
-    const _ONE_MICROSECOND: Duration = Duration::from_nanos(1_000);
-    const _ONE_NANOSECOND: Duration = Duration::from_nanos(1);
-    const _ONE: usize = _ONE_SECOND.as_secs() as usize;
-    const _TWO: usize = _ONE_MILLISECOND.subsec_millis() as usize;
-    const _THREE: usize = _ONE_MICROSECOND.subsec_micros() as usize;
-    const _FOUR: usize = _ONE_NANOSECOND.subsec_nanos() as usize;
-    const _0: [[u8; _ONE]; _TWO] = [[1; _ONE]; _TWO];
-    const _1: [[u8; _THREE]; _FOUR] = [[3; _THREE]; _FOUR];
-}