Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shorten Span of unused macro lints #90761

Merged
merged 1 commit into from
Nov 12, 2021
Merged

Shorten Span of unused macro lints #90761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions compiler/rustc_resolve/src/build_reduced_graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,15 +1194,9 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
// Mark the given macro as unused unless its name starts with `_`.
// Macro uses will remove items from this set, and the remaining
// items will be reported as `unused_macros`.
fn insert_unused_macro(
&mut self,
ident: Ident,
def_id: LocalDefId,
node_id: NodeId,
span: Span,
) {
fn insert_unused_macro(&mut self, ident: Ident, def_id: LocalDefId, node_id: NodeId) {
if !ident.as_str().starts_with('_') {
self.r.unused_macros.insert(def_id, (node_id, span));
self.r.unused_macros.insert(def_id, (node_id, ident));
}
}

Expand Down Expand Up @@ -1246,7 +1240,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
self.r.define(module, ident, MacroNS, (res, vis, span, expansion, IsMacroExport));
} else {
self.r.check_reserved_macro_name(ident, res);
self.insert_unused_macro(ident, def_id, item.id, span);
self.insert_unused_macro(ident, def_id, item.id);
}
self.r.visibilities.insert(def_id, vis);
self.r.arenas.alloc_macro_rules_scope(MacroRulesScope::Binding(
Expand All @@ -1267,7 +1261,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
_ => self.resolve_visibility(&item.vis),
};
if vis != ty::Visibility::Public {
self.insert_unused_macro(ident, def_id, item.id, span);
self.insert_unused_macro(ident, def_id, item.id);
}
self.r.define(module, ident, MacroNS, (res, vis, span, expansion));
self.r.visibilities.insert(def_id, vis);
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_resolve/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ pub struct Resolver<'a> {
non_macro_attr: Lrc<SyntaxExtension>,
local_macro_def_scopes: FxHashMap<LocalDefId, Module<'a>>,
ast_transform_scopes: FxHashMap<LocalExpnId, Module<'a>>,
unused_macros: FxHashMap<LocalDefId, (NodeId, Span)>,
unused_macros: FxHashMap<LocalDefId, (NodeId, Ident)>,
proc_macro_stubs: FxHashSet<LocalDefId>,
/// Traces collected during macro resolution and validated when it's complete.
single_segment_macro_resolutions:
Expand Down
9 changes: 7 additions & 2 deletions compiler/rustc_resolve/src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,13 @@ impl<'a> ResolverExpand for Resolver<'a> {
}

fn check_unused_macros(&mut self) {
for (_, &(node_id, span)) in self.unused_macros.iter() {
self.lint_buffer.buffer_lint(UNUSED_MACROS, node_id, span, "unused macro definition");
for (_, &(node_id, ident)) in self.unused_macros.iter() {
self.lint_buffer.buffer_lint(
UNUSED_MACROS,
node_id,
ident.span,
&format!("unused macro definition: `{}`", ident.as_str()),
);
}
}

Expand Down
11 changes: 4 additions & 7 deletions src/test/ui/lint/unused/issue-70041.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
warning: unused macro definition
--> $DIR/issue-70041.rs:4:1
warning: unused macro definition: `regex`
--> $DIR/issue-70041.rs:4:14
|
LL | / macro_rules! regex {
LL | |
LL | | () => {};
LL | | }
| |_^
LL | macro_rules! regex {
| ^^^^^
|
= note: `#[warn(unused_macros)]` on by default

Expand Down
35 changes: 12 additions & 23 deletions src/test/ui/lint/unused/unused-macro-rules.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,26 @@
error: unused macro definition
--> $DIR/unused-macro-rules.rs:4:1
error: unused macro definition: `unused`
--> $DIR/unused-macro-rules.rs:4:14
|
LL | / macro_rules! unused {
LL | | () => {};
LL | | }
| |_^
LL | macro_rules! unused {
| ^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-macro-rules.rs:1:9
|
LL | #![deny(unused_macros)]
| ^^^^^^^^^^^^^

error: unused macro definition
--> $DIR/unused-macro-rules.rs:11:9
error: unused macro definition: `m`
--> $DIR/unused-macro-rules.rs:11:22
|
LL | / macro_rules! m {
LL | | () => {};
LL | | }
| |_________^
...
LL | create_macro!();
| --------------- in this macro invocation
|
= note: this error originates in the macro `create_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
LL | macro_rules! m {
| ^

error: unused macro definition
--> $DIR/unused-macro-rules.rs:24:5
error: unused macro definition: `unused`
--> $DIR/unused-macro-rules.rs:24:18
|
LL | / macro_rules! unused {
LL | | () => {};
LL | | }
| |_____^
LL | macro_rules! unused {
| ^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-macro-rules.rs:23:12
Expand Down
30 changes: 12 additions & 18 deletions src/test/ui/lint/unused/unused-macro.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,32 @@
error: unused macro definition
--> $DIR/unused-macro.rs:5:1
error: unused macro definition: `unused`
--> $DIR/unused-macro.rs:5:7
|
LL | / macro unused {
LL | | () => {}
LL | | }
| |_^
LL | macro unused {
| ^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-macro.rs:2:9
|
LL | #![deny(unused_macros)]
| ^^^^^^^^^^^^^

error: unused macro definition
--> $DIR/unused-macro.rs:15:5
error: unused macro definition: `unused`
--> $DIR/unused-macro.rs:15:11
|
LL | / macro unused {
LL | | () => {}
LL | | }
| |_____^
LL | macro unused {
| ^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-macro.rs:14:12
|
LL | #[deny(unused_macros)]
| ^^^^^^^^^^^^^

error: unused macro definition
--> $DIR/unused-macro.rs:21:5
error: unused macro definition: `unused`
--> $DIR/unused-macro.rs:21:22
|
LL | / pub(crate) macro unused {
LL | | () => {}
LL | | }
| |_____^
LL | pub(crate) macro unused {
| ^^^^^^

error: aborting due to 3 previous errors

2 changes: 1 addition & 1 deletion src/test/ui/proc-macro/issue-39889.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// run-pass

#![allow(dead_code)]
#![allow(dead_code, unused_macros)]
Copy link
Contributor Author

@hellow554 hellow554 Nov 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is very insteresting.

rust/src/test/ui/proc-macro/auxiliary/issue-39889.rs

Lines 10 to 17 in 493ea77

pub fn f(_input: TokenStream) -> TokenStream {
let rules = r#"
macro_rules! id {
($($tt:tt)*) => { $($tt)* };
}
"#;
rules.parse().unwrap()
}

Any idea why the unused macro wasn't linted before?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, no idea. My best guess is that now we have a span for id, but we didn't for the whole macro. I think changing the test is reasonable. The issue is about the macro expansion machinery, so it's reasonable to allow it.

// aux-build:issue-39889.rs

extern crate issue_39889;
Expand Down