Rollup merge of #145430 - Urgau:drop_forget_useless-145427, r=lqd
Fix wrong spans with external macros in the `dropping_copy_types` lint This PR fixes some wrong spans manipulations when external macros are involved. Specifically we didn't make sure the spans had the same context, which kind-of make our spans manipulations go wrong and produce weird spans. We fix that by making sure they have the same context. Fixes https://github.com/rust-lang/rust/issues/145427
This commit is contained in:
@@ -151,7 +151,7 @@ impl<'tcx> LateLintPass<'tcx> for DropForgetUseless {
|
|||||||
&& let Node::Stmt(stmt) = node
|
&& let Node::Stmt(stmt) = node
|
||||||
&& let StmtKind::Semi(e) = stmt.kind
|
&& let StmtKind::Semi(e) = stmt.kind
|
||||||
&& e.hir_id == expr.hir_id
|
&& e.hir_id == expr.hir_id
|
||||||
&& let Some(arg_span) = arg.span.find_ancestor_inside(expr.span)
|
&& let Some(arg_span) = arg.span.find_ancestor_inside_same_ctxt(expr.span)
|
||||||
{
|
{
|
||||||
UseLetUnderscoreIgnoreSuggestion::Suggestion {
|
UseLetUnderscoreIgnoreSuggestion::Suggestion {
|
||||||
start_span: expr.span.shrink_to_lo().until(arg_span),
|
start_span: expr.span.shrink_to_lo().until(arg_span),
|
||||||
|
|||||||
@@ -9,4 +9,7 @@ fn main() {
|
|||||||
let mut msg = String::new();
|
let mut msg = String::new();
|
||||||
let _ = writeln!(&mut msg, "test");
|
let _ = writeln!(&mut msg, "test");
|
||||||
//~^ ERROR calls to `std::mem::drop`
|
//~^ ERROR calls to `std::mem::drop`
|
||||||
|
|
||||||
|
let _ = format_args!("a");
|
||||||
|
//~^ ERROR calls to `std::mem::drop`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,4 +9,7 @@ fn main() {
|
|||||||
let mut msg = String::new();
|
let mut msg = String::new();
|
||||||
drop(writeln!(&mut msg, "test"));
|
drop(writeln!(&mut msg, "test"));
|
||||||
//~^ ERROR calls to `std::mem::drop`
|
//~^ ERROR calls to `std::mem::drop`
|
||||||
|
|
||||||
|
drop(format_args!("a"));
|
||||||
|
//~^ ERROR calls to `std::mem::drop`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,5 +17,19 @@ LL - drop(writeln!(&mut msg, "test"));
|
|||||||
LL + let _ = writeln!(&mut msg, "test");
|
LL + let _ = writeln!(&mut msg, "test");
|
||||||
|
|
|
|
||||||
|
|
||||||
error: aborting due to 1 previous error
|
error: calls to `std::mem::drop` with a value that implements `Copy` does nothing
|
||||||
|
--> $DIR/dropping_copy_types-macros.rs:13:5
|
||||||
|
|
|
||||||
|
LL | drop(format_args!("a"));
|
||||||
|
| ^^^^^-----------------^
|
||||||
|
| |
|
||||||
|
| argument has type `Arguments<'_>`
|
||||||
|
|
|
||||||
|
help: use `let _ = ...` to ignore the expression or result
|
||||||
|
|
|
||||||
|
LL - drop(format_args!("a"));
|
||||||
|
LL + let _ = format_args!("a");
|
||||||
|
|
|
||||||
|
|
||||||
|
error: aborting due to 2 previous errors
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user