Merging upstream version 1.70.0+dfsg1.

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

4 files changed, 0 insertions, 26 deletions

diff --git a/tests/run-make-fulldeps/mixing-deps/Makefile b/tests/run-make-fulldeps/mixing-deps/Makefile
deleted file mode 100644
index 956e704ee..000000000
--- a/tests/run-make-fulldeps/mixing-deps/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-include ../tools.mk
-
-all:
-	$(RUSTC) both.rs -C prefer-dynamic
-	$(RUSTC) dylib.rs -C prefer-dynamic
-	$(RUSTC) prog.rs
-	$(call RUN,prog)
diff --git a/tests/run-make-fulldeps/mixing-deps/both.rs b/tests/run-make-fulldeps/mixing-deps/both.rs
deleted file mode 100644
index 6a5818763..000000000
--- a/tests/run-make-fulldeps/mixing-deps/both.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#![crate_type = "rlib"]
-#![crate_type = "dylib"]
-
-pub static foo: isize = 4;
diff --git a/tests/run-make-fulldeps/mixing-deps/dylib.rs b/tests/run-make-fulldeps/mixing-deps/dylib.rs
deleted file mode 100644
index 88976d5b6..000000000
--- a/tests/run-make-fulldeps/mixing-deps/dylib.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![crate_type = "dylib"]
-extern crate both;
-
-use std::mem;
-
-pub fn addr() -> usize { unsafe { mem::transmute(&both::foo) } }
diff --git a/tests/run-make-fulldeps/mixing-deps/prog.rs b/tests/run-make-fulldeps/mixing-deps/prog.rs
deleted file mode 100644
index 188981dc1..000000000
--- a/tests/run-make-fulldeps/mixing-deps/prog.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-extern crate dylib;
-extern crate both;
-
-use std::mem;
-
-fn main() {
-    assert_eq!(unsafe { mem::transmute::<&isize, usize>(&both::foo) },
-               dylib::addr());
-}