Skip to content

Commit 62268e4

Browse files
committed
Auto merge of rust-lang#15527 - HKalbasi:diagnostics-allow, r=HKalbasi
Respect `#[allow(unused_braces)]` fix rust-lang#15526
2 parents 144526c + 514fefa commit 62268e4

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

Diff for: crates/ide-diagnostics/src/handlers/mutability_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pub(crate) fn unused_mut(ctx: &DiagnosticsContext<'_>, d: &hir::UnusedMut) -> Di
7676
"variable does not need to be mutable",
7777
ast,
7878
)
79-
.experimental() // Not supporting `#[allow(unused_mut)]` leads to false positive.
79+
.experimental() // Not supporting `#[allow(unused_mut)]` in proc macros leads to false positive.
8080
.with_fixes(fixes)
8181
}
8282

Diff for: crates/ide-diagnostics/src/handlers/useless_braces.rs

+21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use hir::InFile;
12
use ide_db::{base_db::FileId, source_change::SourceChange};
23
use itertools::Itertools;
34
use syntax::{ast, AstNode, SyntaxNode};
@@ -39,6 +40,7 @@ pub(crate) fn useless_braces(
3940
"Unnecessary braces in use statement".to_string(),
4041
use_range,
4142
)
43+
.with_main_node(InFile::new(file_id.into(), node.clone()))
4244
.with_fixes(Some(vec![fix(
4345
"remove_braces",
4446
"Remove unnecessary braces",
@@ -153,6 +155,25 @@ use a::{c, d::{e$0}};
153155
r#"
154156
mod a { pub mod c {} pub mod d { pub mod e {} } }
155157
use a::{c, d::e};
158+
"#,
159+
);
160+
}
161+
162+
#[test]
163+
fn respect_lint_attributes_for_unused_braces() {
164+
check_diagnostics(
165+
r#"
166+
mod b {}
167+
#[allow(unused_braces)]
168+
use {b};
169+
"#,
170+
);
171+
check_diagnostics(
172+
r#"
173+
mod b {}
174+
#[deny(unused_braces)]
175+
use {b};
176+
//^^^ 💡 error: Unnecessary braces in use statement
156177
"#,
157178
);
158179
}

0 commit comments

Comments
 (0)