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/error-found-staticlib-instead-crate/Makefile | 5 ----- tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs | 5 ----- tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs | 1 - 3 files changed, 11 deletions(-) delete mode 100644 tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile delete mode 100644 tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs delete mode 100644 tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs (limited to 'tests/run-make-fulldeps/error-found-staticlib-instead-crate') diff --git a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile b/tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile deleted file mode 100644 index 0eae41d72..000000000 --- a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -include ../tools.mk - -all: - $(RUSTC) foo.rs --crate-type staticlib - $(RUSTC) bar.rs 2>&1 | $(CGREP) "found staticlib" diff --git a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs b/tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs deleted file mode 100644 index fe35f1f8e..000000000 --- a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs +++ /dev/null @@ -1,5 +0,0 @@ -extern crate foo; - -fn main() { - foo::foo(); -} diff --git a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs b/tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs deleted file mode 100644 index b76b4321d..000000000 --- a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs +++ /dev/null @@ -1 +0,0 @@ -pub fn foo() {} -- cgit v1.2.3