Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/ui/parser/assoc-static-syntactic-fail.rs b/tests/ui/parser/assoc-static-syntactic-fail.rs
new file mode 100644
index 000000000..492f2ea16
--- /dev/null
+++ b/tests/ui/parser/assoc-static-syntactic-fail.rs
@@ -0,0 +1,33 @@
+// Syntactically, we do allow e.g., `static X: u8 = 0;` as an associated item.
+
+fn main() {}
+
+#[cfg(FALSE)]
+impl S {
+    static IA: u8 = 0; //~ ERROR associated `static` items are not allowed
+    static IB: u8; //~ ERROR associated `static` items are not allowed
+    default static IC: u8 = 0; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+    pub(crate) default static ID: u8; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+}
+
+#[cfg(FALSE)]
+trait T {
+    static TA: u8 = 0; //~ ERROR associated `static` items are not allowed
+    static TB: u8; //~ ERROR associated `static` items are not allowed
+    default static TC: u8 = 0; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+    pub(crate) default static TD: u8; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+}
+
+#[cfg(FALSE)]
+impl T for S {
+    static TA: u8 = 0; //~ ERROR associated `static` items are not allowed
+    static TB: u8; //~ ERROR associated `static` items are not allowed
+    default static TC: u8 = 0; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+    pub default static TD: u8; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+}