Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 15 deletions

diff --git a/src/test/ui/derives/auxiliary/derive-marker-tricky.rs b/src/test/ui/derives/auxiliary/derive-marker-tricky.rs
deleted file mode 100644
index 70345351b..000000000
--- a/src/test/ui/derives/auxiliary/derive-marker-tricky.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// force-host
-// no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
-extern crate proc_macro;
-use proc_macro::*;
-
-#[proc_macro_derive(NoMarker)]
-pub fn f(input: TokenStream) -> TokenStream {
-    if input.to_string().contains("rustc_copy_clone_marker") {
-        panic!("found `#[rustc_copy_clone_marker]`");
-    }
-    TokenStream::new()
-}