Merging upstream version 1.70.0+dfsg1.

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

7 files changed, 0 insertions, 74 deletions

diff --git a/tests/run-make-fulldeps/share-generics-dylib/Makefile b/tests/run-make-fulldeps/share-generics-dylib/Makefile
deleted file mode 100644
index 065fb574c..000000000
--- a/tests/run-make-fulldeps/share-generics-dylib/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# This test makes sure all generic instances get re-exported from Rust dylibs for use by
-# `-Zshare-generics`. There are two rlibs (`instance_provider_a` and `instance_provider_b`)
-# which both provide an instance of `Cell<i32>::set`. There is `instance_user_dylib` which is
-# supposed to re-export both these instances, and then there are `instance_user_a_rlib` and
-# `instance_user_b_rlib` which each rely on a specific instance to be available.
-#
-# In the end everything is linked together into `linked_leaf`. If `instance_user_dylib` does
-# not export both then we'll get an `undefined reference` error for one of the instances.
-#
-# This is regression test for https://github.com/rust-lang/rust/issues/67276.
-
-include ../../run-make-fulldeps/tools.mk
-
-COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Csymbol-mangling-version=v0
-
-all:
-	$(RUSTC) instance_provider_a.rs $(COMMON_ARGS) --crate-type=rlib
-	$(RUSTC) instance_provider_b.rs $(COMMON_ARGS) --crate-type=rlib
-	$(RUSTC) instance_user_dylib.rs $(COMMON_ARGS) --crate-type=dylib
-	$(RUSTC) instance_user_a_rlib.rs $(COMMON_ARGS) --crate-type=rlib
-	$(RUSTC) instance_user_b_rlib.rs $(COMMON_ARGS) --crate-type=rlib
-	$(RUSTC) linked_leaf.rs $(COMMON_ARGS) --crate-type=bin
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs
deleted file mode 100644
index b4e125ac0..000000000
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use std::cell::Cell;
-
-pub fn foo() {
-    let a: Cell<i32> = Cell::new(1);
-    a.set(123);
-}
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs
deleted file mode 100644
index f613db873..000000000
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use std::cell::Cell;
-
-pub fn foo() {
-    let b: Cell<i32> = Cell::new(1);
-    b.set(123);
-}
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs
deleted file mode 100644
index c8e6ab95c..000000000
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-extern crate instance_provider_a as upstream;
-use std::cell::Cell;
-
-pub fn foo() {
-    upstream::foo();
-
-    let b: Cell<i32> = Cell::new(1);
-    b.set(123);
-}
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs
deleted file mode 100644
index 7c34af6d0..000000000
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-extern crate instance_provider_b as upstream;
-use std::cell::Cell;
-
-pub fn foo() {
-    upstream::foo();
-
-    let b: Cell<i32> = Cell::new(1);
-    b.set(123);
-}
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs b/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs
deleted file mode 100644
index 7c8368eec..000000000
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-extern crate instance_provider_a;
-extern crate instance_provider_b;
-
-pub fn foo() {
-    instance_provider_a::foo();
-    instance_provider_b::foo();
-}
diff --git a/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs b/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs
deleted file mode 100644
index e510dad69..000000000
--- a/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-extern crate instance_user_dylib;
-extern crate instance_user_a_rlib;
-extern crate instance_user_b_rlib;
-
-use std::cell::Cell;
-
-fn main() {
-
-    instance_user_a_rlib::foo();
-    instance_user_b_rlib::foo();
-    instance_user_dylib::foo();
-
-    let a: Cell<i32> = Cell::new(1);
-    a.set(123);
-}