From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../abstraction/abstracted_assume.rs               | 72 ----------------------
 .../abstraction/const_generic_fn.rs                | 41 ------------
 2 files changed, 113 deletions(-)
 delete mode 100644 src/test/ui/transmutability/abstraction/abstracted_assume.rs
 delete mode 100644 src/test/ui/transmutability/abstraction/const_generic_fn.rs

(limited to 'src/test/ui/transmutability/abstraction')

diff --git a/src/test/ui/transmutability/abstraction/abstracted_assume.rs b/src/test/ui/transmutability/abstraction/abstracted_assume.rs
deleted file mode 100644
index 0225c4230..000000000
--- a/src/test/ui/transmutability/abstraction/abstracted_assume.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-// check-pass
-//! The implementation should behave correctly when the `ASSUME` parameters are
-//! provided indirectly through an abstraction.
-
-#![crate_type = "lib"]
-#![feature(adt_const_params)]
-#![feature(transmutability)]
-#![allow(dead_code, incomplete_features, non_camel_case_types)]
-
-mod assert {
-    use std::mem::BikeshedIntrinsicFrom;
-
-    pub fn is_transmutable<
-        Src,
-        Dst,
-        Context,
-        const ASSUME: std::mem::Assume,
-    >()
-    where
-        Dst: BikeshedIntrinsicFrom<
-            Src,
-            Context,
-            ASSUME,
-        >,
-    {}
-}
-
-fn direct() {
-    struct Context;
-    #[repr(C)] struct Src;
-    #[repr(C)] struct Dst;
-
-    assert::is_transmutable::<Src, Dst, Context, { std::mem::Assume::NOTHING }>();
-}
-
-fn via_const() {
-    struct Context;
-    #[repr(C)] struct Src;
-    #[repr(C)] struct Dst;
-
-    const FALSE: bool = false;
-
-    assert::is_transmutable::<Src, Dst, Context, { std::mem::Assume::NOTHING }>();
-}
-
-fn via_associated_const() {
-    struct Context;
-    #[repr(C)] struct Src;
-    #[repr(C)] struct Dst;
-
-    trait Trait {
-        const FALSE: bool = true;
-    }
-
-    struct Ty;
-
-    impl Trait for Ty {}
-
-    assert::is_transmutable::<
-        Src,
-        Dst,
-        Context,
-        {
-            std::mem::Assume {
-                alignment: {Ty::FALSE},
-                lifetimes: {Ty::FALSE},
-                safety: {Ty::FALSE},
-                validity: {Ty::FALSE},
-            }
-        }
-    >();
-}
diff --git a/src/test/ui/transmutability/abstraction/const_generic_fn.rs b/src/test/ui/transmutability/abstraction/const_generic_fn.rs
deleted file mode 100644
index e693a0957..000000000
--- a/src/test/ui/transmutability/abstraction/const_generic_fn.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// check-pass
-//! An array must have the correct length.
-
-#![crate_type = "lib"]
-#![feature(transmutability)]
-#![allow(dead_code, incomplete_features, non_camel_case_types)]
-
-mod assert {
-    use std::mem::{Assume, BikeshedIntrinsicFrom};
-    pub struct Context;
-
-    pub fn array_like<T, E, const N: usize>()
-    where
-        T: BikeshedIntrinsicFrom<[E; N], Context, { Assume::SAFETY }>,
-        [E; N]: BikeshedIntrinsicFrom<T, Context, { Assume::SAFETY }>
-    {}
-}
-
-fn len_0() {
-    type Array = [u8; 0];
-    #[repr(C)] struct Struct();
-    assert::array_like::<Struct, u8, 0>();
-}
-
-fn len_1() {
-    type Array = [u8; 1];
-    #[repr(C)] struct Struct(u8);
-    assert::array_like::<Struct, u8, 1>();
-}
-
-fn len_2() {
-    type Array = [u8; 2];
-    #[repr(C)] struct Struct(u8, u8);
-    assert::array_like::<Struct, u8, 2>();
-}
-
-fn len_3() {
-    type Array = [u8; 3];
-    #[repr(C)] struct Struct(u8, u8, u8);
-    assert::array_like::<Struct, u8, 3>();
-}
-- 
cgit v1.2.3