Merging upstream version 1.70.0+dfsg1.

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

4 files changed, 27 insertions, 0 deletions

diff --git a/tests/run-make/issue-38237/Makefile b/tests/run-make/issue-38237/Makefile
new file mode 100644
index 000000000..80dddc5bd
--- /dev/null
+++ b/tests/run-make/issue-38237/Makefile
@@ -0,0 +1,6 @@
+# ignore-cross-compile
+include ../tools.mk
+
+all:
+	$(RUSTC) foo.rs; $(RUSTC) bar.rs
+	$(RUSTDOC) baz.rs -L $(TMPDIR) -o $(TMPDIR)
diff --git a/tests/run-make/issue-38237/bar.rs b/tests/run-make/issue-38237/bar.rs
new file mode 100644
index 000000000..2b839f3a3
--- /dev/null
+++ b/tests/run-make/issue-38237/bar.rs
@@ -0,0 +1,4 @@
+#![crate_type = "lib"]
+
+#[derive(Debug)]
+pub struct S;
diff --git a/tests/run-make/issue-38237/baz.rs b/tests/run-make/issue-38237/baz.rs
new file mode 100644
index 000000000..cd2425f9b
--- /dev/null
+++ b/tests/run-make/issue-38237/baz.rs
@@ -0,0 +1,8 @@
+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/issue-38237/foo.rs b/tests/run-make/issue-38237/foo.rs
new file mode 100644
index 000000000..a106e4fde
--- /dev/null
+++ b/tests/run-make/issue-38237/foo.rs
@@ -0,0 +1,9 @@
+#![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;