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/issue-38237/Makefile b/tests/run-make-fulldeps/issue-38237/Makefile
deleted file mode 100644
index 75121d040..000000000
--- a/tests/run-make-fulldeps/issue-38237/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../tools.mk
-
-all:
-	$(RUSTC) foo.rs; $(RUSTC) bar.rs
-	$(RUSTDOC) baz.rs -L $(TMPDIR) -o $(TMPDIR)
diff --git a/tests/run-make-fulldeps/issue-38237/bar.rs b/tests/run-make-fulldeps/issue-38237/bar.rs
deleted file mode 100644
index 2b839f3a3..000000000
--- a/tests/run-make-fulldeps/issue-38237/bar.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#![crate_type = "lib"]
-
-#[derive(Debug)]
-pub struct S;
diff --git a/tests/run-make-fulldeps/issue-38237/baz.rs b/tests/run-make-fulldeps/issue-38237/baz.rs
deleted file mode 100644
index cd2425f9b..000000000
--- a/tests/run-make-fulldeps/issue-38237/baz.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-extern crate foo;
-extern crate bar;
-
-pub struct Bar;
-impl ::std::ops::Deref for Bar {
-    type Target = bar::S;
-    fn deref(&self) -> &Self::Target { unimplemented!() }
-}
diff --git a/tests/run-make-fulldeps/issue-38237/foo.rs b/tests/run-make-fulldeps/issue-38237/foo.rs
deleted file mode 100644
index a106e4fde..000000000
--- a/tests/run-make-fulldeps/issue-38237/foo.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![crate_type = "proc-macro"]
-
-extern crate proc_macro;
-
-#[proc_macro_derive(A)]
-pub fn derive(ts: proc_macro::TokenStream) -> proc_macro::TokenStream { ts }
-
-#[derive(Debug)]
-struct S;