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/extern-multiple-copies2/Makefile | 10 ---------- tests/run-make-fulldeps/extern-multiple-copies2/bar.rs | 8 -------- tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs | 7 ------- tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs | 8 -------- 4 files changed, 33 deletions(-) delete mode 100644 tests/run-make-fulldeps/extern-multiple-copies2/Makefile delete mode 100644 tests/run-make-fulldeps/extern-multiple-copies2/bar.rs delete mode 100644 tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs delete mode 100644 tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs (limited to 'tests/run-make-fulldeps/extern-multiple-copies2') diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/Makefile b/tests/run-make-fulldeps/extern-multiple-copies2/Makefile deleted file mode 100644 index 84de2ebf3..000000000 --- a/tests/run-make-fulldeps/extern-multiple-copies2/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -include ../tools.mk - -all: - $(RUSTC) foo1.rs - $(RUSTC) foo2.rs - mkdir $(TMPDIR)/foo - cp $(TMPDIR)/libfoo1.rlib $(TMPDIR)/foo/libfoo1.rlib - $(RUSTC) bar.rs \ - --extern foo1=$(TMPDIR)/foo/libfoo1.rlib \ - --extern foo2=$(TMPDIR)/libfoo2.rlib diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/bar.rs b/tests/run-make-fulldeps/extern-multiple-copies2/bar.rs deleted file mode 100644 index b3088152d..000000000 --- a/tests/run-make-fulldeps/extern-multiple-copies2/bar.rs +++ /dev/null @@ -1,8 +0,0 @@ -#[macro_use] -extern crate foo2; // foo2 first to exhibit the bug -#[macro_use] -extern crate foo1; - -fn main() { - foo2::foo2(foo1::A); -} diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs b/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs deleted file mode 100644 index 4c778e52f..000000000 --- a/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs +++ /dev/null @@ -1,7 +0,0 @@ -#![crate_type = "rlib"] - -pub struct A; - -pub fn foo1(a: A) { - drop(a); -} diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs b/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs deleted file mode 100644 index 2be103507..000000000 --- a/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs +++ /dev/null @@ -1,8 +0,0 @@ -#![crate_type = "rlib"] - -#[macro_use] -extern crate foo1; - -pub fn foo2(a: foo1::A) { - foo1::foo1(a); -} -- cgit v1.2.3