Skip to content

Commit e7863df

Browse files
chenyukangchenyukang
committed
Supress unhelpful diagnostics for unresolved top level attributes
1 parent df0295f commit e7863df

29 files changed

+142
-233
lines changed

‎compiler/rustc_passes/src/check_attr.rs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,12 +2495,8 @@ fn is_c_like_enum(item: &Item<'_>) -> bool {
24952495
}
24962496
}
24972497

2498-
// FIXME: Fix "Cannot determine resolution" error and remove built-in macros
2499-
// from this check.
2498+
// builtin macros will be checked in resolve
25002499
fn check_invalid_crate_level_attr(tcx: TyCtxt<'_>, attrs: &[Attribute]) {
2501-
// Check for builtin attributes at the crate level
2502-
// which were unsuccessfully resolved due to cannot determine
2503-
// resolution for the attribute macro error.
25042500
const ATTRS_TO_CHECK: &[Symbol] = &[
25052501
sym::macro_export,
25062502
sym::repr,
@@ -2509,11 +2505,6 @@ fn check_invalid_crate_level_attr(tcx: TyCtxt<'_>, attrs: &[Attribute]) {
25092505
sym::start,
25102506
sym::rustc_main,
25112507
sym::unix_sigpipe,
2512-
sym::derive,
2513-
sym::test,
2514-
sym::test_case,
2515-
sym::global_allocator,
2516-
sym::bench,
25172508
];
25182509

25192510
for attr in attrs {

‎compiler/rustc_resolve/messages.ftl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ resolve_invalid_asm_sym =
151151
.label = is a local variable
152152
.help = `sym` operands must refer to either a function or a static
153153
154+
resolve_invalid_attr_at_crate_level =
155+
`{$name}` attribute cannot be used at crate level
156+
.suggestion = perhaps you meant to use an outer attribute
157+
154158
resolve_is_not_directly_importable =
155159
`{$target}` is not directly importable
156160
.label = cannot be imported directly

‎compiler/rustc_resolve/src/errors.rs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
use crate::fluent_generated as fluent;
2+
use rustc_errors::ErrorGuaranteed;
3+
use rustc_errors::IntoDiagnostic;
14
use rustc_macros::{Diagnostic, Subdiagnostic};
25
use rustc_span::{
36
symbol::{Ident, Symbol},
@@ -771,3 +774,30 @@ pub(crate) struct IsNotDirectlyImportable {
771774
pub(crate) span: Span,
772775
pub(crate) target: Ident,
773776
}
777+
778+
pub struct InvalidAttrAtCrateLevel {
779+
pub span: Span,
780+
pub sugg_span: Option<Span>,
781+
pub name: Symbol,
782+
}
783+
784+
impl IntoDiagnostic<'_> for InvalidAttrAtCrateLevel {
785+
#[track_caller]
786+
fn into_diagnostic(
787+
self,
788+
handler: &'_ rustc_errors::Handler,
789+
) -> rustc_errors::DiagnosticBuilder<'_, ErrorGuaranteed> {
790+
let mut diag = handler.struct_err(fluent::resolve_invalid_attr_at_crate_level);
791+
diag.set_span(self.span);
792+
diag.set_arg("name", self.name);
793+
if let Some(span) = self.sugg_span {
794+
diag.span_suggestion_verbose(
795+
span,
796+
fluent::resolve_suggestion,
797+
String::new(),
798+
rustc_errors::Applicability::MachineApplicable,
799+
);
800+
}
801+
diag
802+
}
803+
}

‎compiler/rustc_resolve/src/lib.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,13 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
15841584
self.get_macro(res).is_some_and(|macro_data| macro_data.ext.builtin_name.is_some())
15851585
}
15861586

1587+
fn is_builtin(&mut self, res: Res) -> bool {
1588+
if self.is_builtin_macro(res) {
1589+
return true;
1590+
}
1591+
self.builtin_attrs_bindings.values().any(|b| b.res() == res)
1592+
}
1593+
15871594
fn macro_def(&self, mut ctxt: SyntaxContext) -> DefId {
15881595
loop {
15891596
match ctxt.outer_expn_data().macro_def_id {

‎compiler/rustc_resolve/src/macros.rs‎

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//! A bunch of methods and structures more or less related to resolving macros and
22
//! interface provided by `Resolver` to macro expander.
33
4+
use crate::ast::AttrStyle;
5+
use crate::ast::Attribute;
46
use crate::errors::{
57
self, AddAsNonDerive, CannotDetermineMacroResolution, CannotFindIdentInThisScope,
68
MacroExpectedFound, RemoveSurroundingDerive,
@@ -35,6 +37,7 @@ use rustc_span::edition::Edition;
3537
use rustc_span::hygiene::{self, ExpnData, ExpnKind, LocalExpnId};
3638
use rustc_span::hygiene::{AstPass, MacroKind};
3739
use rustc_span::symbol::{kw, sym, Ident, Symbol};
40+
use rustc_span::BytePos;
3841
use rustc_span::{Span, DUMMY_SP};
3942
use std::cell::Cell;
4043
use std::mem;
@@ -698,6 +701,31 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
698701
res.map(|res| (self.get_macro(res).map(|macro_data| macro_data.ext.clone()), res))
699702
}
700703

704+
fn report_invalid_crate_level_attr(&mut self, attrs: &[Attribute], name: Symbol) -> bool {
705+
for attr in attrs.iter().filter(|attr| attr.style == AttrStyle::Inner) {
706+
if attr.has_name(name) {
707+
let tcx = self.tcx;
708+
tcx.sess.emit_err(errors::InvalidAttrAtCrateLevel {
709+
span: attr.span,
710+
sugg_span: tcx
711+
.sess
712+
.source_map()
713+
.span_to_snippet(attr.span)
714+
.ok()
715+
.filter(|src| src.starts_with("#!["))
716+
.map(|_| {
717+
attr.span
718+
.with_lo(attr.span.lo() + BytePos(1))
719+
.with_hi(attr.span.lo() + BytePos(2))
720+
}),
721+
name,
722+
});
723+
return true;
724+
}
725+
}
726+
false
727+
}
728+
701729
pub(crate) fn finalize_macro_resolutions(&mut self, krate: &Crate) {
702730
let check_consistency = |this: &mut Self,
703731
path: &[Segment],
@@ -717,15 +745,28 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
717745
// expanded into a dummy fragment for recovery during expansion.
718746
// Now, post-expansion, the resolution may succeed, but we can't change the
719747
// past and need to report an error.
720-
// However, non-speculative `resolve_path` can successfully return private items
748+
// Special cases:
749+
// 1. non-speculative `resolve_path` can successfully return private items
721750
// even if speculative `resolve_path` returned nothing previously, so we skip this
722751
// less informative error if the privacy error is reported elsewhere.
752+
// 2. issue #118455, unresolved top level attribute error didn't imported prelude and
753+
// already have emitted an error, report builtin macro and attributes error by the way,
754+
// so `check_invalid_crate_level_attr` in can ignore them.
755+
756+
let is_builtin = res.opt_def_id().map_or(false, |_| this.is_builtin(res));
723757
if this.privacy_errors.is_empty() {
724-
this.tcx.sess.emit_err(CannotDetermineMacroResolution {
725-
span,
726-
kind: kind.descr(),
727-
path: Segment::names_to_string(path),
728-
});
758+
let mut fallback = !is_builtin;
759+
if is_builtin && krate.id == ast::CRATE_NODE_ID {
760+
fallback =
761+
!this.report_invalid_crate_level_attr(&krate.attrs, path[0].ident.name);
762+
}
763+
if fallback && this.tcx.sess.has_errors().is_none() {
764+
this.tcx.sess.emit_err(CannotDetermineMacroResolution {
765+
span,
766+
kind: kind.descr(),
767+
path: Segment::names_to_string(path),
768+
});
769+
}
729770
}
730771
}
731772
};

‎tests/ui/derives/issue-36617.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
#![derive(Copy)] //~ ERROR cannot determine resolution for the attribute macro `derive`
1+
#![derive(Copy)]
22
//~^ ERROR `derive` attribute cannot be used at crate level
33

4-
#![test]//~ ERROR cannot determine resolution for the attribute macro `test`
4+
#![test]
55
//~^ ERROR `test` attribute cannot be used at crate level
66

7-
#![test_case]//~ ERROR cannot determine resolution for the attribute macro `test_case`
7+
#![test_case]
88
//~^ ERROR `test_case` attribute cannot be used at crate level
99

10-
#![bench]//~ ERROR cannot determine resolution for the attribute macro `bench`
10+
#![bench]
1111
//~^ ERROR `bench` attribute cannot be used at crate level
1212

13-
#![global_allocator]//~ ERROR cannot determine resolution for the attribute macro `global_allocator`
13+
#![global_allocator]
1414
//~^ ERROR `global_allocator` attribute cannot be used at crate level
1515

1616
fn main() {}

‎tests/ui/derives/issue-36617.stderr‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,8 @@
1-
error: cannot determine resolution for the attribute macro `derive`
2-
--> $DIR/issue-36617.rs:1:4
3-
|
4-
LL | #![derive(Copy)]
5-
| ^^^^^^
6-
|
7-
= note: import resolution is stuck, try simplifying macro imports
8-
9-
error: cannot determine resolution for the attribute macro `test`
10-
--> $DIR/issue-36617.rs:4:4
11-
|
12-
LL | #![test]
13-
| ^^^^
14-
|
15-
= note: import resolution is stuck, try simplifying macro imports
16-
17-
error: cannot determine resolution for the attribute macro `test_case`
18-
--> $DIR/issue-36617.rs:7:4
19-
|
20-
LL | #![test_case]
21-
| ^^^^^^^^^
22-
|
23-
= note: import resolution is stuck, try simplifying macro imports
24-
25-
error: cannot determine resolution for the attribute macro `bench`
26-
--> $DIR/issue-36617.rs:10:4
27-
|
28-
LL | #![bench]
29-
| ^^^^^
30-
|
31-
= note: import resolution is stuck, try simplifying macro imports
32-
33-
error: cannot determine resolution for the attribute macro `global_allocator`
34-
--> $DIR/issue-36617.rs:13:4
35-
|
36-
LL | #![global_allocator]
37-
| ^^^^^^^^^^^^^^^^
38-
|
39-
= note: import resolution is stuck, try simplifying macro imports
40-
411
error: `derive` attribute cannot be used at crate level
422
--> $DIR/issue-36617.rs:1:1
433
|
444
LL | #![derive(Copy)]
455
| ^^^^^^^^^^^^^^^^
46-
...
47-
LL | fn main() {}
48-
| ---- the inner attribute doesn't annotate this function
496
|
507
help: perhaps you meant to use an outer attribute
518
|
@@ -58,9 +15,6 @@ error: `test` attribute cannot be used at crate level
5815
|
5916
LL | #![test]
6017
| ^^^^^^^^
61-
...
62-
LL | fn main() {}
63-
| ---- the inner attribute doesn't annotate this function
6418
|
6519
help: perhaps you meant to use an outer attribute
6620
|
@@ -73,9 +27,6 @@ error: `test_case` attribute cannot be used at crate level
7327
|
7428
LL | #![test_case]
7529
| ^^^^^^^^^^^^^
76-
...
77-
LL | fn main() {}
78-
| ---- the inner attribute doesn't annotate this function
7930
|
8031
help: perhaps you meant to use an outer attribute
8132
|
@@ -88,9 +39,6 @@ error: `bench` attribute cannot be used at crate level
8839
|
8940
LL | #![bench]
9041
| ^^^^^^^^^
91-
...
92-
LL | fn main() {}
93-
| ---- the inner attribute doesn't annotate this function
9442
|
9543
help: perhaps you meant to use an outer attribute
9644
|
@@ -103,15 +51,12 @@ error: `global_allocator` attribute cannot be used at crate level
10351
|
10452
LL | #![global_allocator]
10553
| ^^^^^^^^^^^^^^^^^^^^
106-
...
107-
LL | fn main() {}
108-
| ---- the inner attribute doesn't annotate this function
10954
|
11055
help: perhaps you meant to use an outer attribute
11156
|
11257
LL - #![global_allocator]
11358
LL + #[global_allocator]
11459
|
11560

116-
error: aborting due to 10 previous errors
61+
error: aborting due to 5 previous errors
11762

‎tests/ui/extenv/issue-55897.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ mod unresolved_env {
44
use env; //~ ERROR unresolved import `env`
55

66
include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
7-
//~^ ERROR cannot determine resolution for the macro `env`
87
}
98

109
mod nonexistent_env {

‎tests/ui/extenv/issue-55897.stderr‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: environment variable `NON_EXISTENT` not defined at compile time
2-
--> $DIR/issue-55897.rs:11:22
2+
--> $DIR/issue-55897.rs:10:22
33
|
44
LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
55
| ^^^^^^^^^^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
88
= note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info)
99

1010
error: suffixes on string literals are invalid
11-
--> $DIR/issue-55897.rs:16:22
11+
--> $DIR/issue-55897.rs:15:22
1212
|
1313
LL | include!(concat!("NON_EXISTENT"suffix, "/data.rs"));
1414
| ^^^^^^^^^^^^^^^^^^^^ invalid suffix `suffix`
@@ -33,14 +33,6 @@ help: consider importing this module instead
3333
LL | use std::env;
3434
| ~~~~~~~~
3535

36-
error: cannot determine resolution for the macro `env`
37-
--> $DIR/issue-55897.rs:6:22
38-
|
39-
LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
40-
| ^^^
41-
|
42-
= note: import resolution is stuck, try simplifying macro imports
43-
44-
error: aborting due to 5 previous errors
36+
error: aborting due to 4 previous errors
4537

4638
For more information about this error, try `rustc --explain E0432`.

‎tests/ui/feature-gates/issue-43106-gating-of-bench.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// handled in "weird places" when `--test` is passed.
44

55
#![feature(custom_inner_attributes)]
6-
7-
#![bench = "4100"]
8-
//~^ ERROR cannot determine resolution for the attribute macro `bench`
9-
//~^^ ERROR `bench` attribute cannot be used at crate level
6+
#![bench = "4100"]
7+
//~^ ERROR `bench` attribute cannot be used at crate level
108
fn main() {}

0 commit comments

Comments
 (0)