Merging upstream version 1.68.2+dfsg1.

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

4 files changed, 20 insertions, 0 deletions

diff --git a/tests/run-make-fulldeps/resolve-rename/Makefile b/tests/run-make-fulldeps/resolve-rename/Makefile
new file mode 100644
index 000000000..00f83a5d6
--- /dev/null
+++ b/tests/run-make-fulldeps/resolve-rename/Makefile
@@ -0,0 +1,7 @@
+include ../tools.mk
+
+all:
+	$(RUSTC) -C extra-filename=-hash foo.rs
+	$(RUSTC) bar.rs
+	mv $(TMPDIR)/libfoo-hash.rlib $(TMPDIR)/libfoo-another-hash.rlib
+	$(RUSTC) baz.rs
diff --git a/tests/run-make-fulldeps/resolve-rename/bar.rs b/tests/run-make-fulldeps/resolve-rename/bar.rs
new file mode 100644
index 000000000..4a09ce355
--- /dev/null
+++ b/tests/run-make-fulldeps/resolve-rename/bar.rs
@@ -0,0 +1,5 @@
+#![crate_type = "rlib"]
+
+extern crate foo;
+
+pub fn bar() { foo::foo() }
diff --git a/tests/run-make-fulldeps/resolve-rename/baz.rs b/tests/run-make-fulldeps/resolve-rename/baz.rs
new file mode 100644
index 000000000..9176073ef
--- /dev/null
+++ b/tests/run-make-fulldeps/resolve-rename/baz.rs
@@ -0,0 +1,5 @@
+#![crate_type = "rlib"]
+
+extern crate bar;
+
+pub fn baz() { bar::bar() }
diff --git a/tests/run-make-fulldeps/resolve-rename/foo.rs b/tests/run-make-fulldeps/resolve-rename/foo.rs
new file mode 100644
index 000000000..bd6820098
--- /dev/null
+++ b/tests/run-make-fulldeps/resolve-rename/foo.rs
@@ -0,0 +1,3 @@
+#![crate_type = "rlib"]
+
+pub fn foo() {}