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

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../ui/zero-sized/zero-size-type-destructors.rs    | 21 ----------------
 .../ui/zero-sized/zero-sized-binary-heap-push.rs   | 20 ---------------
 .../ui/zero-sized/zero-sized-btreemap-insert.rs    | 25 -------------------
 .../ui/zero-sized/zero-sized-linkedlist-push.rs    | 29 ----------------------
 src/test/ui/zero-sized/zero-sized-tuple-struct.rs  | 13 ----------
 5 files changed, 108 deletions(-)
 delete mode 100644 src/test/ui/zero-sized/zero-size-type-destructors.rs
 delete mode 100644 src/test/ui/zero-sized/zero-sized-binary-heap-push.rs
 delete mode 100644 src/test/ui/zero-sized/zero-sized-btreemap-insert.rs
 delete mode 100644 src/test/ui/zero-sized/zero-sized-linkedlist-push.rs
 delete mode 100644 src/test/ui/zero-sized/zero-sized-tuple-struct.rs

(limited to 'src/test/ui/zero-sized')

diff --git a/src/test/ui/zero-sized/zero-size-type-destructors.rs b/src/test/ui/zero-sized/zero-size-type-destructors.rs
deleted file mode 100644
index fb87d8ea0..000000000
--- a/src/test/ui/zero-sized/zero-size-type-destructors.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// run-pass
-#![allow(non_upper_case_globals)]
-
-static mut destructions : isize = 3;
-
-pub fn foo() {
-    struct Foo;
-
-    impl Drop for Foo {
-        fn drop(&mut self) {
-          unsafe { destructions -= 1 };
-        }
-    }
-
-    let _x = [Foo, Foo, Foo];
-}
-
-pub fn main() {
-  foo();
-  assert_eq!(unsafe { destructions }, 0);
-}
diff --git a/src/test/ui/zero-sized/zero-sized-binary-heap-push.rs b/src/test/ui/zero-sized/zero-sized-binary-heap-push.rs
deleted file mode 100644
index 6553c5adb..000000000
--- a/src/test/ui/zero-sized/zero-sized-binary-heap-push.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// run-pass
-#![allow(unused_variables)]
-use std::collections::BinaryHeap;
-use std::iter::Iterator;
-
-fn main() {
-    const N: usize = 8;
-
-    for len in 0..N {
-        let mut tester = BinaryHeap::with_capacity(len);
-        assert_eq!(tester.len(), 0);
-        assert!(tester.capacity() >= len);
-        for bit in 0..len {
-            tester.push(());
-        }
-        assert_eq!(tester.len(), len);
-        assert_eq!(tester.iter().count(), len);
-        tester.clear();
-    }
-}
diff --git a/src/test/ui/zero-sized/zero-sized-btreemap-insert.rs b/src/test/ui/zero-sized/zero-sized-btreemap-insert.rs
deleted file mode 100644
index 52edb33d6..000000000
--- a/src/test/ui/zero-sized/zero-sized-btreemap-insert.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// run-pass
-#![allow(unused_variables)]
-#![allow(unused_imports)]
-use std::cmp::{Ord, Ordering, PartialOrd};
-use std::collections::BTreeMap;
-use std::iter::Iterator;
-
-#[derive(Eq, Hash, Debug, Ord, PartialEq, PartialOrd)]
-struct Zst;
-
-fn main() {
-    const N: usize = 8;
-
-    for len in 0..N {
-        let mut tester = BTreeMap::new();
-        assert_eq!(tester.len(), 0);
-        for bit in 0..len {
-            tester.insert(Zst, ());
-        }
-        assert_eq!(tester.len(), if len == 0 { 0 } else { 1 });
-        assert_eq!(tester.iter().count(), if len == 0 { 0 } else { 1 });
-        assert_eq!(tester.get(&Zst).is_some(), len > 0);
-        tester.clear();
-    }
-}
diff --git a/src/test/ui/zero-sized/zero-sized-linkedlist-push.rs b/src/test/ui/zero-sized/zero-sized-linkedlist-push.rs
deleted file mode 100644
index 03724085f..000000000
--- a/src/test/ui/zero-sized/zero-sized-linkedlist-push.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// run-pass
-use std::collections::LinkedList;
-use std::iter::Iterator;
-
-fn main() {
-    const N: usize = 8;
-
-    // Test that for all possible sequences of push_front / push_back,
-    // we end up with a LinkedList of the correct size
-
-    for len in 0..N {
-        let mut tester = LinkedList::new();
-        assert_eq!(tester.len(), 0);
-        assert_eq!(tester.front(), None);
-        for case in 0..(1 << len) {
-            assert_eq!(tester.len(), 0);
-            for bit in 0..len {
-                if case & (1 << bit) != 0 {
-                    tester.push_front(());
-                } else {
-                    tester.push_back(());
-                }
-            }
-            assert_eq!(tester.len(), len);
-            assert_eq!(tester.iter().count(), len);
-            tester.clear();
-        }
-    }
-}
diff --git a/src/test/ui/zero-sized/zero-sized-tuple-struct.rs b/src/test/ui/zero-sized/zero-sized-tuple-struct.rs
deleted file mode 100644
index 2208590f7..000000000
--- a/src/test/ui/zero-sized/zero-sized-tuple-struct.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// run-pass
-#![allow(unused_braces)]
-#![allow(unused_assignments)]
-
-// Make sure that the constructor args are codegened for zero-sized tuple structs
-
-struct Foo(());
-
-fn main() {
-    let mut a = 1;
-    Foo({ a = 2 });
-    assert_eq!(a, 2);
-}
-- 
cgit v1.2.3