From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/run-make-fulldeps/missing-crate-dependency/Makefile | 9 --------- src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs | 2 -- src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs | 1 - src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs | 3 --- 4 files changed, 15 deletions(-) delete mode 100644 src/test/run-make-fulldeps/missing-crate-dependency/Makefile delete mode 100644 src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs delete mode 100644 src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs delete mode 100644 src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs (limited to 'src/test/run-make-fulldeps/missing-crate-dependency') diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/Makefile b/src/test/run-make-fulldeps/missing-crate-dependency/Makefile deleted file mode 100644 index 7c271ab8a..000000000 --- a/src/test/run-make-fulldeps/missing-crate-dependency/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -include ../tools.mk - -all: - $(RUSTC) --crate-type=rlib crateA.rs - $(RUSTC) --crate-type=rlib crateB.rs - $(call REMOVE_RLIBS,crateA) - # Ensure crateC fails to compile since dependency crateA is missing - $(RUSTC) crateC.rs 2>&1 | \ - $(CGREP) 'can'"'"'t find crate for `crateA` which `crateB` depends on' diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs deleted file mode 100644 index 31433cb60..000000000 --- a/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs +++ /dev/null @@ -1,2 +0,0 @@ -// Base crate -pub fn func() {} diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs deleted file mode 100644 index 4ccd65d65..000000000 --- a/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs +++ /dev/null @@ -1 +0,0 @@ -extern crate crateA; diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs deleted file mode 100644 index a8b817ec6..000000000 --- a/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs +++ /dev/null @@ -1,3 +0,0 @@ -extern crate crateB; - -fn main() {} -- cgit v1.2.3