From 1376c5a617be5c25655d0d7cb63e3beaa5a6e026 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:20:39 +0200 Subject: Merging upstream version 1.70.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/run-make-fulldeps/issue-40535/Makefile | 13 ------------- tests/run-make-fulldeps/issue-40535/bar.rs | 3 --- tests/run-make-fulldeps/issue-40535/baz.rs | 1 - tests/run-make-fulldeps/issue-40535/foo.rs | 4 ---- 4 files changed, 21 deletions(-) delete mode 100644 tests/run-make-fulldeps/issue-40535/Makefile delete mode 100644 tests/run-make-fulldeps/issue-40535/bar.rs delete mode 100644 tests/run-make-fulldeps/issue-40535/baz.rs delete mode 100644 tests/run-make-fulldeps/issue-40535/foo.rs (limited to 'tests/run-make-fulldeps/issue-40535') diff --git a/tests/run-make-fulldeps/issue-40535/Makefile b/tests/run-make-fulldeps/issue-40535/Makefile deleted file mode 100644 index 155c88252..000000000 --- a/tests/run-make-fulldeps/issue-40535/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -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/tests/run-make-fulldeps/issue-40535/bar.rs b/tests/run-make-fulldeps/issue-40535/bar.rs deleted file mode 100644 index b02b28f59..000000000 --- a/tests/run-make-fulldeps/issue-40535/bar.rs +++ /dev/null @@ -1,3 +0,0 @@ -#![crate_type = "lib"] - -extern crate baz; diff --git a/tests/run-make-fulldeps/issue-40535/baz.rs b/tests/run-make-fulldeps/issue-40535/baz.rs deleted file mode 100644 index 83be6e807..000000000 --- a/tests/run-make-fulldeps/issue-40535/baz.rs +++ /dev/null @@ -1 +0,0 @@ -#![crate_type = "lib"] diff --git a/tests/run-make-fulldeps/issue-40535/foo.rs b/tests/run-make-fulldeps/issue-40535/foo.rs deleted file mode 100644 index 270202664..000000000 --- a/tests/run-make-fulldeps/issue-40535/foo.rs +++ /dev/null @@ -1,4 +0,0 @@ -#![crate_type = "lib"] - -extern crate bar; -extern crate baz; -- cgit v1.2.3