From 9c0ce05d246811a977b6564b7df2b6947bd6903b Mon Sep 17 00:00:00 2001
From: surechen <chenshuo17@huawei.com>
Date: Sat, 29 Jun 2024 18:45:07 +0800
Subject: [PATCH] Show `used attribute`'s kind for user when find it isn't
applied to a `static` variable.
fixes #126789
---
compiler/rustc_passes/messages.ftl | 1 +
compiler/rustc_passes/src/check_attr.rs | 10 +++++++---
compiler/rustc_passes/src/errors.rs | 3 +++
tests/ui/attributes/used-issue-126789.rs | 6 ++++++
tests/ui/attributes/used-issue-126789.stderr | 10 ++++++++++
tests/ui/used.stderr | 8 ++++++++
6 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644 tests/ui/attributes/used-issue-126789.rs
create mode 100644 tests/ui/attributes/used-issue-126789.stderr
diff --git a/compiler/rustc_passes/messages.ftl b/compiler/rustc_passes/messages.ftl
index 07c82065a80d1..3cc909a9d6e45 100644
--- a/compiler/rustc_passes/messages.ftl
+++ b/compiler/rustc_passes/messages.ftl
@@ -786,6 +786,7 @@ passes_used_compiler_linker =
passes_used_static =
attribute must be applied to a `static` variable
+ .label = but this is a {$target}
passes_useless_assignment =
useless assignment of {$is_field_assign ->
diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs
index a0b3470df6dba..238e40022c9cf 100644
--- a/compiler/rustc_passes/src/check_attr.rs
+++ b/compiler/rustc_passes/src/check_attr.rs
@@ -278,7 +278,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
}
self.check_repr(attrs, span, target, item, hir_id);
- self.check_used(attrs, target);
+ self.check_used(attrs, target, span);
}
fn inline_attr_str_error_with_macro_def(&self, hir_id: HirId, attr: &Attribute, sym: &str) {
@@ -1978,12 +1978,16 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
}
}
- fn check_used(&self, attrs: &[Attribute], target: Target) {
+ fn check_used(&self, attrs: &[Attribute], target: Target, target_span: Span) {
let mut used_linker_span = None;
let mut used_compiler_span = None;
for attr in attrs.iter().filter(|attr| attr.has_name(sym::used)) {
if target != Target::Static {
- self.dcx().emit_err(errors::UsedStatic { span: attr.span });
+ self.dcx().emit_err(errors::UsedStatic {
+ attr_span: attr.span,
+ span: target_span,
+ target: target.name(),
+ });
}
let inner = attr.meta_item_list();
match inner.as_deref() {
diff --git a/compiler/rustc_passes/src/errors.rs b/compiler/rustc_passes/src/errors.rs
index 25df80d5a92ca..897a377ce3461 100644
--- a/compiler/rustc_passes/src/errors.rs
+++ b/compiler/rustc_passes/src/errors.rs
@@ -563,7 +563,10 @@ pub struct ReprConflictingLint;
#[diag(passes_used_static)]
pub struct UsedStatic {
#[primary_span]
+ pub attr_span: Span,
+ #[label]
pub span: Span,
+ pub target: &'static str,
}
#[derive(Diagnostic)]
diff --git a/tests/ui/attributes/used-issue-126789.rs b/tests/ui/attributes/used-issue-126789.rs
new file mode 100644
index 0000000000000..90a1aa8d5cc3d
--- /dev/null
+++ b/tests/ui/attributes/used-issue-126789.rs
@@ -0,0 +1,6 @@
+extern "C" {
+ #[used] //~ ERROR attribute must be applied to a `static` variable
+ static FOO: i32;
+}
+
+fn main() {}
diff --git a/tests/ui/attributes/used-issue-126789.stderr b/tests/ui/attributes/used-issue-126789.stderr
new file mode 100644
index 0000000000000..6014f7af95c55
--- /dev/null
+++ b/tests/ui/attributes/used-issue-126789.stderr
@@ -0,0 +1,10 @@
+error: attribute must be applied to a `static` variable
+ --> $DIR/used-issue-126789.rs:2:5
+ |
+LL | #[used]
+ | ^^^^^^^
+LL | static FOO: i32;
+ | ---------------- but this is a foreign static item
+
+error: aborting due to 1 previous error
+
diff --git a/tests/ui/used.stderr b/tests/ui/used.stderr
index ea77f129d8ef0..c586dc722932f 100644
--- a/tests/ui/used.stderr
+++ b/tests/ui/used.stderr
@@ -3,24 +3,32 @@ error: attribute must be applied to a `static` variable
|
LL | #[used]
| ^^^^^^^
+LL | fn foo() {}
+ | ----------- but this is a function
error: attribute must be applied to a `static` variable
--> $DIR/used.rs:7:1
|
LL | #[used]
| ^^^^^^^
+LL | struct Foo {}
+ | ------------- but this is a struct
error: attribute must be applied to a `static` variable
--> $DIR/used.rs:10:1
|
LL | #[used]
| ^^^^^^^
+LL | trait Bar {}
+ | ------------ but this is a trait
error: attribute must be applied to a `static` variable
--> $DIR/used.rs:13:1
|
LL | #[used]
| ^^^^^^^
+LL | impl Bar for Foo {}
+ | ------------------- but this is a implementation block
error: aborting due to 4 previous errors