Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 57 deletions

diff --git a/src/test/ui/structs-enums/rec-align-u32.rs b/src/test/ui/structs-enums/rec-align-u32.rs
deleted file mode 100644
index ee704198d..000000000
--- a/src/test/ui/structs-enums/rec-align-u32.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-#![allow(unused_unsafe)]
-// Issue #2303
-
-#![feature(intrinsics)]
-
-use std::mem;
-
-mod rusti {
-    extern "rust-intrinsic" {
-        pub fn pref_align_of<T>() -> usize;
-        #[rustc_safe_intrinsic]
-        pub fn min_align_of<T>() -> usize;
-    }
-}
-
-// This is the type with the questionable alignment
-#[derive(Debug)]
-struct Inner {
-    c64: u32
-}
-
-// This is the type that contains the type with the
-// questionable alignment, for testing
-#[derive(Debug)]
-struct Outer {
-    c8: u8,
-    t: Inner
-}
-
-mod m {
-    pub fn align() -> usize { 4 }
-    pub fn size() -> usize { 8 }
-}
-
-pub fn main() {
-    unsafe {
-        let x = Outer {c8: 22, t: Inner {c64: 44}};
-
-        // Send it through the shape code
-        let y = format!("{:?}", x);
-
-        println!("align inner = {:?}", rusti::min_align_of::<Inner>());
-        println!("size outer = {:?}", mem::size_of::<Outer>());
-        println!("y = {:?}", y);
-
-        // per clang/gcc the alignment of `inner` is 4 on x86.
-        assert_eq!(rusti::min_align_of::<Inner>(), m::align());
-
-        // per clang/gcc the size of `outer` should be 12
-        // because `inner`s alignment was 4.
-        assert_eq!(mem::size_of::<Outer>(), m::size());
-
-        assert_eq!(y, "Outer { c8: 22, t: Inner { c64: 44 } }".to_string());
-    }
-}