Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 36 deletions

diff --git a/src/test/ui/allocator/xcrate-use.rs b/src/test/ui/allocator/xcrate-use.rs
deleted file mode 100644
index edd4df75e..000000000
--- a/src/test/ui/allocator/xcrate-use.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// run-pass
-
-// aux-build:custom.rs
-// aux-build:helper.rs
-// no-prefer-dynamic
-
-#![feature(allocator_api)]
-#![feature(slice_ptr_get)]
-
-extern crate custom;
-extern crate helper;
-
-use std::alloc::{Allocator, Global, Layout, System};
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-#[global_allocator]
-static GLOBAL: custom::A = custom::A(AtomicUsize::new(0));
-
-fn main() {
-    unsafe {
-        let n = GLOBAL.0.load(Ordering::SeqCst);
-        let layout = Layout::from_size_align(4, 2).unwrap();
-
-        let memory = Global.allocate(layout.clone()).unwrap();
-        helper::work_with(&memory);
-        assert_eq!(GLOBAL.0.load(Ordering::SeqCst), n + 1);
-        Global.deallocate(memory.as_non_null_ptr(), layout);
-        assert_eq!(GLOBAL.0.load(Ordering::SeqCst), n + 2);
-
-        let memory = System.allocate(layout.clone()).unwrap();
-        assert_eq!(GLOBAL.0.load(Ordering::SeqCst), n + 2);
-        helper::work_with(&memory);
-        System.deallocate(memory.as_non_null_ptr(), layout);
-        assert_eq!(GLOBAL.0.load(Ordering::SeqCst), n + 2);
-    }
-}