Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 57 deletions

diff --git a/src/test/ui/proc-macro/macro-namespace-reserved-2.rs b/src/test/ui/proc-macro/macro-namespace-reserved-2.rs
deleted file mode 100644
index 470b22b48..000000000
--- a/src/test/ui/proc-macro/macro-namespace-reserved-2.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// force-host
-// no-prefer-dynamic
-
-#![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
-}
-
-fn check_bang1() {
-    my_macro!(); //~ ERROR can't use a procedural macro from the same crate that defines it
-}
-fn check_bang2() {
-    my_macro_attr!(); //~ ERROR cannot find macro `my_macro_attr` in this scope
-    crate::my_macro_attr!(); //~ ERROR can't use a procedural macro from the same crate that defines
-                             //~| ERROR expected macro, found attribute macro `crate::my_macro_attr`
-}
-fn check_bang3() {
-    MyTrait!(); //~ ERROR cannot find macro `MyTrait` in this scope
-    crate::MyTrait!(); //~ ERROR can't use a procedural macro from the same crate that defines it
-                       //~| ERROR expected macro, found derive macro `crate::MyTrait`
-}
-
-#[my_macro] //~ ERROR cannot find attribute `my_macro` in this scope
-#[crate::my_macro] //~ ERROR can't use a procedural macro from the same crate that defines it
-                   //~| ERROR expected attribute, found macro `crate::my_macro`
-fn check_attr1() {}
-#[my_macro_attr] //~ ERROR can't use a procedural macro from the same crate that defines it
-fn check_attr2() {}
-#[MyTrait] //~ ERROR can't use a procedural macro from the same crate that defines it
-           //~| ERROR expected attribute, found derive macro `MyTrait`
-fn check_attr3() {}
-
-#[derive(my_macro)] //~ ERROR cannot find derive macro `my_macro` in this scope
-                    //~| ERROR cannot find derive macro `my_macro` in this scope
-#[derive(crate::my_macro)] //~ ERROR can't use a procedural macro from the same crate that defines
-                           //~| ERROR expected derive macro, found macro `crate::my_macro`
-struct CheckDerive1;
-#[derive(my_macro_attr)] //~ ERROR can't use a procedural macro from the same crate that defines it
-                         //~| ERROR expected derive macro, found attribute macro `my_macro_attr`
-struct CheckDerive2;
-#[derive(MyTrait)] //~ ERROR can't use a procedural macro from the same crate that defines it
-struct CheckDerive3;