From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../allow-warnings-cmdline-stability/Makefile             | 15 ---------------
 .../allow-warnings-cmdline-stability/bar.rs               |  5 -----
 .../allow-warnings-cmdline-stability/foo.rs               |  5 -----
 3 files changed, 25 deletions(-)
 delete mode 100644 src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
 delete mode 100644 src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
 delete mode 100644 src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs

(limited to 'src/test/run-make-fulldeps/allow-warnings-cmdline-stability')

diff --git a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
deleted file mode 100644
index 1ce8d0ec2..000000000
--- a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-include ../tools.mk
-
-# Test that -A warnings makes the 'empty trait list for derive' warning go away
-DEP=$(shell $(RUSTC) bar.rs)
-OUT=$(shell $(RUSTC) foo.rs -A warnings 2>&1 | grep "warning" )
-
-all: foo bar
-	test -z '$(OUT)'
-
-# These are just to ensure that the above commands actually work
-bar:
-	$(RUSTC) bar.rs
-
-foo: bar
-	$(RUSTC) foo.rs -A warnings
diff --git a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
deleted file mode 100644
index 3dcfb9dad..000000000
--- a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#![crate_type = "lib"]
-#![feature(staged_api)]
-#![unstable(feature = "unstable_test_feature", issue = "none")]
-
-pub fn baz() {}
diff --git a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
deleted file mode 100644
index 869b54354..000000000
--- a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#![feature(unstable_test_feature)]
-
-extern crate bar;
-
-pub fn main() { bar::baz() }
-- 
cgit v1.2.3