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>
---
 tests/ui/proc-macro/ambiguous-builtin-attrs.rs | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 tests/ui/proc-macro/ambiguous-builtin-attrs.rs

(limited to 'tests/ui/proc-macro/ambiguous-builtin-attrs.rs')

diff --git a/tests/ui/proc-macro/ambiguous-builtin-attrs.rs b/tests/ui/proc-macro/ambiguous-builtin-attrs.rs
new file mode 100644
index 000000000..695ea69c8
--- /dev/null
+++ b/tests/ui/proc-macro/ambiguous-builtin-attrs.rs
@@ -0,0 +1,39 @@
+// edition:2018
+// aux-build:builtin-attrs.rs
+#![feature(decl_macro)] //~ ERROR `feature` is ambiguous
+
+extern crate builtin_attrs;
+use builtin_attrs::*;
+use builtin_attrs::{bench, test};
+
+#[repr(C)] //~ ERROR `repr` is ambiguous
+struct S;
+#[cfg_attr(all(), repr(C))] //~ ERROR `repr` is ambiguous
+struct SCond;
+
+#[test] // OK, shadowed
+fn test() {}
+
+#[bench] // OK, shadowed
+fn bench() {}
+
+fn non_macro_expanded_location<#[repr(C)] T>() {
+    //~^ ERROR `repr` is ambiguous
+    //~| ERROR attribute should be applied to a struct, enum, or union
+    match 0u8 {
+        #[repr(C)]
+        //~^ ERROR `repr` is ambiguous
+        //~| ERROR attribute should be applied to a struct, enum, or union
+        _ => {}
+    }
+}
+
+fn main() {
+    Test;
+    Bench;
+    NonExistent; //~ ERROR cannot find value `NonExistent` in this scope
+}
+
+use deny as allow;
+#[allow(unused)] //~ ERROR `allow` is ambiguous
+fn builtin_renamed() {}
-- 
cgit v1.2.3