From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:02:58 +0200 Subject: Adding upstream version 1.64.0+dfsg1. Signed-off-by: Daniel Baumann --- src/test/run-make-fulldeps/issue-40535/Makefile | 13 +++++++++++++ src/test/run-make-fulldeps/issue-40535/bar.rs | 3 +++ src/test/run-make-fulldeps/issue-40535/baz.rs | 1 + src/test/run-make-fulldeps/issue-40535/foo.rs | 4 ++++ 4 files changed, 21 insertions(+) create mode 100644 src/test/run-make-fulldeps/issue-40535/Makefile create mode 100644 src/test/run-make-fulldeps/issue-40535/bar.rs create mode 100644 src/test/run-make-fulldeps/issue-40535/baz.rs create mode 100644 src/test/run-make-fulldeps/issue-40535/foo.rs (limited to 'src/test/run-make-fulldeps/issue-40535') diff --git a/src/test/run-make-fulldeps/issue-40535/Makefile b/src/test/run-make-fulldeps/issue-40535/Makefile new file mode 100644 index 000000000..49db1d43e --- /dev/null +++ b/src/test/run-make-fulldeps/issue-40535/Makefile @@ -0,0 +1,13 @@ +-include ../tools.mk + +# The ICE occurred in the following situation: +# * `foo` declares `extern crate bar, baz`, depends only on `bar` (forgetting `baz` in `Cargo.toml`) +# * `bar` declares and depends on `extern crate baz` +# * All crates built in metadata-only mode (`cargo check`) +all: + # cc https://github.com/rust-lang/rust/issues/40623 + $(RUSTC) baz.rs --emit=metadata + $(RUSTC) bar.rs --emit=metadata --extern baz=$(TMPDIR)/libbaz.rmeta + $(RUSTC) foo.rs --emit=metadata --extern bar=$(TMPDIR)/libbar.rmeta 2>&1 | \ + $(CGREP) -v "unexpectedly panicked" + # ^ Succeeds if it doesn't find the ICE message diff --git a/src/test/run-make-fulldeps/issue-40535/bar.rs b/src/test/run-make-fulldeps/issue-40535/bar.rs new file mode 100644 index 000000000..b02b28f59 --- /dev/null +++ b/src/test/run-make-fulldeps/issue-40535/bar.rs @@ -0,0 +1,3 @@ +#![crate_type = "lib"] + +extern crate baz; diff --git a/src/test/run-make-fulldeps/issue-40535/baz.rs b/src/test/run-make-fulldeps/issue-40535/baz.rs new file mode 100644 index 000000000..83be6e807 --- /dev/null +++ b/src/test/run-make-fulldeps/issue-40535/baz.rs @@ -0,0 +1 @@ +#![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/issue-40535/foo.rs b/src/test/run-make-fulldeps/issue-40535/foo.rs new file mode 100644 index 000000000..270202664 --- /dev/null +++ b/src/test/run-make-fulldeps/issue-40535/foo.rs @@ -0,0 +1,4 @@ +#![crate_type = "lib"] + +extern crate bar; +extern crate baz; -- cgit v1.2.3