Merging upstream version 1.68.2+dfsg1.

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

3 files changed, 0 insertions, 43 deletions

diff --git a/src/test/run-make-fulldeps/std-core-cycle/Makefile b/src/test/run-make-fulldeps/std-core-cycle/Makefile
deleted file mode 100644
index 4f2528637..000000000
--- a/src/test/run-make-fulldeps/std-core-cycle/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-include ../tools.mk
-
-ifeq ($(UNAME),Darwin)
-FLAGS :=
-else
-ifdef IS_WINDOWS
-FLAGS :=
-else
-FLAGS := -C link-args=-Wl,--no-undefined
-endif
-endif
-
-all:
-	$(RUSTC) bar.rs
-	$(RUSTC) foo.rs $(FLAGS)
-	$(RUSTC) foo.rs $(FLAGS) -C panic=abort
diff --git a/src/test/run-make-fulldeps/std-core-cycle/bar.rs b/src/test/run-make-fulldeps/std-core-cycle/bar.rs
deleted file mode 100644
index 9f5e7c29b..000000000
--- a/src/test/run-make-fulldeps/std-core-cycle/bar.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#![feature(allocator_api)]
-#![crate_type = "rlib"]
-
-use std::alloc::*;
-
-pub struct A;
-
-unsafe impl GlobalAlloc for A {
-    unsafe fn alloc(&self, _: Layout) -> *mut u8 {
-        loop {}
-    }
-
-    unsafe fn dealloc(&self, _ptr: *mut u8, _: Layout) {
-        loop {}
-    }
-}
diff --git a/src/test/run-make-fulldeps/std-core-cycle/foo.rs b/src/test/run-make-fulldeps/std-core-cycle/foo.rs
deleted file mode 100644
index 6aa6e1ac3..000000000
--- a/src/test/run-make-fulldeps/std-core-cycle/foo.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![crate_type = "cdylib"]
-
-extern crate bar;
-
-#[global_allocator]
-static A: bar::A = bar::A;
-
-#[no_mangle]
-pub extern "C" fn a(a: u32, b: u32) -> u32 {
-    a / b
-}