Skip to content

Commit

Permalink
Fix handling of macro arguments within the `dropping_copy_types lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Urgau committed Aug 22, 2024
1 parent e08b80c commit 6a878a9
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 2 deletions.
5 changes: 3 additions & 2 deletions compiler/rustc_lint/src/drop_forget_useless.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,11 @@ impl<'tcx> LateLintPass<'tcx> for DropForgetUseless {
&& let Node::Stmt(stmt) = node
&& let StmtKind::Semi(e) = stmt.kind
&& e.hir_id == expr.hir_id
&& let Some(arg_span) = arg.span.find_ancestor_inside(expr.span)
{
UseLetUnderscoreIgnoreSuggestion::Suggestion {
start_span: expr.span.shrink_to_lo().until(arg.span),
end_span: arg.span.shrink_to_hi().until(expr.span.shrink_to_hi()),
start_span: expr.span.shrink_to_lo().until(arg_span),
end_span: arg_span.shrink_to_hi().until(expr.span.shrink_to_hi()),
}
} else {
UseLetUnderscoreIgnoreSuggestion::Note
Expand Down
12 changes: 12 additions & 0 deletions tests/ui/lint/dropping_copy_types-macros.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//@ check-fail
//@ run-rustfix

#![deny(dropping_copy_types)]

use std::fmt::Write;

fn main() {
let mut msg = String::new();
let _ = writeln!(&mut msg, "test");
//~^ ERROR calls to `std::mem::drop`
}
12 changes: 12 additions & 0 deletions tests/ui/lint/dropping_copy_types-macros.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//@ check-fail
//@ run-rustfix

#![deny(dropping_copy_types)]

use std::fmt::Write;

fn main() {
let mut msg = String::new();
drop(writeln!(&mut msg, "test"));
//~^ ERROR calls to `std::mem::drop`
}
21 changes: 21 additions & 0 deletions tests/ui/lint/dropping_copy_types-macros.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
error: calls to `std::mem::drop` with a value that implements `Copy` does nothing
--> $DIR/dropping_copy_types-macros.rs:10:5
|
LL | drop(writeln!(&mut msg, "test"));
| ^^^^^--------------------------^
| |
| argument has type `Result<(), std::fmt::Error>`
|
note: the lint level is defined here
--> $DIR/dropping_copy_types-macros.rs:4:9
|
LL | #![deny(dropping_copy_types)]
| ^^^^^^^^^^^^^^^^^^^
help: use `let _ = ...` to ignore the expression or result
|
LL - drop(writeln!(&mut msg, "test"));
LL + let _ = writeln!(&mut msg, "test");
|

error: aborting due to 1 previous error

0 comments on commit 6a878a9

Please sign in to comment.