Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 38 deletions

diff --git a/src/test/ui/proc-macro/macro-namespace-reserved.rs b/src/test/ui/proc-macro/macro-namespace-reserved.rs
deleted file mode 100644
index 60d379e41..000000000
--- a/src/test/ui/proc-macro/macro-namespace-reserved.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// force-host
-// no-prefer-dynamic
-
-#![feature(decl_macro)]
-#![crate_type = "proc-macro"]
-
-extern crate proc_macro;
-use proc_macro::*;
-
-#[proc_macro]
-pub fn my_macro(input: TokenStream) -> TokenStream {
-    input
-}
-
-#[proc_macro_attribute]
-pub fn my_macro_attr(input: TokenStream, _: TokenStream) -> TokenStream {
-    input
-}
-
-#[proc_macro_derive(MyTrait)]
-pub fn my_macro_derive(input: TokenStream) -> TokenStream {
-    input
-}
-
-macro my_macro() {} //~ ERROR the name `my_macro` is defined multiple times
-macro my_macro_attr() {} //~ ERROR the name `my_macro_attr` is defined multiple times
-macro MyTrait() {} //~ ERROR the name `MyTrait` is defined multiple times
-
-#[proc_macro_derive(SameName)]
-pub fn foo(input: TokenStream) -> TokenStream {
-    input
-}
-
-#[proc_macro]
-pub fn SameName(input: TokenStream) -> TokenStream {
-//~^ ERROR the name `SameName` is defined multiple times
-    input
-}