-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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.
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
Uplift the let_underscore
lints from clippy into rustc.
#97739
Changes from 7 commits
821b32b
ad7587f
758a9fd
36b6309
ae2ac3b
eba6c78
6b179e3
a7e2b3e
7e485bf
1421cff
30e8adb
e6b6678
6342b58
11663b1
b5b5b54
321a598
211feb1
cdf6606
7237e86
b040666
8807c2d
a9095ff
a9f1b7b
d355ec9
76c90c3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,270 @@ | ||
use crate::{LateContext, LateLintPass, LintContext}; | ||
use rustc_errors::Applicability; | ||
use rustc_hir as hir; | ||
use rustc_middle::{ | ||
lint::LintDiagnosticBuilder, | ||
ty::{self, subst::GenericArgKind, Ty}, | ||
}; | ||
use rustc_span::Symbol; | ||
|
||
declare_lint! { | ||
/// The `let_underscore_drop` lint checks for statements which don't bind | ||
/// an expression which has a non-trivial Drop implementation to anything, | ||
/// causing the expression to be dropped immediately instead of at end of | ||
/// scope. | ||
/// | ||
/// ### Example | ||
/// ```rust | ||
/// struct SomeStruct; | ||
/// impl Drop for SomeStruct { | ||
/// fn drop(&mut self) { | ||
/// println!("Dropping SomeStruct"); | ||
/// } | ||
/// } | ||
/// | ||
/// fn main() { | ||
/// // SomeStuct is dropped immediately instead of at end of scope, | ||
/// // so "Dropping SomeStruct" is printed before "end of main". | ||
/// // The order of prints would be reversed if SomeStruct was bound to | ||
/// // a name (such as "_foo"). | ||
/// let _ = SomeStruct; | ||
/// println!("end of main"); | ||
/// } | ||
/// ``` | ||
/// ### Explanation | ||
/// | ||
/// Statements which assign an expression to an underscore causes the | ||
/// expression to immediately drop instead of extending the expression's | ||
/// lifetime to the end of the scope. This is usually unintended, | ||
/// especially for types like `MutexGuard`, which are typically used to | ||
/// lock a mutex for the duration of an entire scope. | ||
/// | ||
/// If you want to extend the expression's lifetime to the end of the scope, | ||
/// assign an underscore-prefixed name (such as `_foo`) to the expression. | ||
/// If you do actually want to drop the expression immediately, then | ||
/// calling `std::mem::drop` on the expression is clearer and helps convey | ||
/// intent. | ||
pub LET_UNDERSCORE_DROP, | ||
Allow, | ||
"non-binding let on a type that implements `Drop`" | ||
} | ||
|
||
declare_lint! { | ||
/// The `let_underscore_lock` lint checks for statements which don't bind | ||
/// a mutex to anything, causing the lock to be released immediately instead | ||
/// of at end of scope, which is typically incorrect. | ||
/// | ||
/// ### Example | ||
/// ```compile_fail | ||
/// use std::sync::{Arc, Mutex}; | ||
/// use std::thread; | ||
/// let data = Arc::new(Mutex::new(0)); | ||
/// | ||
/// thread::spawn(move || { | ||
/// // The lock is immediately released instead of at the end of the | ||
/// // scope, which is probably not intended. | ||
/// let _ = data.lock().unwrap(); | ||
/// println!("doing some work"); | ||
/// let mut lock = data.lock().unwrap(); | ||
/// *lock += 1; | ||
/// }); | ||
/// ``` | ||
/// ### Explanation | ||
/// | ||
/// Statements which assign an expression to an underscore causes the | ||
/// expression to immediately drop instead of extending the expression's | ||
/// lifetime to the end of the scope. This is usually unintended, | ||
/// especially for types like `MutexGuard`, which are typically used to | ||
/// lock a mutex for the duration of an entire scope. | ||
/// | ||
/// If you want to extend the expression's lifetime to the end of the scope, | ||
/// assign an underscore-prefixed name (such as `_foo`) to the expression. | ||
/// If you do actually want to drop the expression immediately, then | ||
/// calling `std::mem::drop` on the expression is clearer and helps convey | ||
/// intent. | ||
pub LET_UNDERSCORE_LOCK, | ||
Deny, | ||
"non-binding let on a synchronization lock" | ||
} | ||
|
||
declare_lint! { | ||
/// The `let_underscore_must_use` lint checks for statements which don't bind | ||
/// a `must_use` expression to anything, causing the lock to be released | ||
/// immediately instead of at end of scope, which is typically incorrect. | ||
/// | ||
/// ### Example | ||
/// ```rust | ||
/// #[must_use] | ||
/// struct SomeStruct; | ||
/// | ||
/// fn main() { | ||
/// // SomeStuct is dropped immediately instead of at end of scope. | ||
/// let _ = SomeStruct; | ||
/// } | ||
/// ``` | ||
/// ### Explanation | ||
/// | ||
/// Statements which assign an expression to an underscore causes the | ||
/// expression to immediately drop. Usually, it's better to explicitly handle | ||
/// the `must_use` expression. | ||
pub LET_UNDERSCORE_MUST_USE, | ||
Allow, | ||
"non-binding let on a expression marked `must_use`" | ||
} | ||
|
||
declare_lint_pass!(LetUnderscore => [LET_UNDERSCORE_DROP, LET_UNDERSCORE_LOCK, LET_UNDERSCORE_MUST_USE]); | ||
|
||
const SYNC_GUARD_PATHS: [&[&str]; 5] = [ | ||
&["std", "sync", "mutex", "MutexGuard"], | ||
&["std", "sync", "rwlock", "RwLockReadGuard"], | ||
&["std", "sync", "rwlock", "RwLockWriteGuard"], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can those paths be replaced by diagnostic items? This will make all this more robust to code being moved within There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These paths were taken directly from the clippy implementation (which is also why they're hardcoded right now--there is a clippy issue meant to address that for clippy though). I can add a diagnostic item for these types, but I'm wondering if something similar to clippy's For now, however, I've added some diagnostic items. |
||
&["parking_lot", "raw_mutex", "RawMutex"], | ||
&["parking_lot", "raw_rwlock", "RawRwLock"], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't know the policy here: is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll remove the |
||
]; | ||
|
||
impl<'tcx> LateLintPass<'tcx> for LetUnderscore { | ||
fn check_local(&mut self, cx: &LateContext<'_>, local: &hir::Local<'_>) { | ||
if !matches!(local.pat.kind, hir::PatKind::Wild) { | ||
return; | ||
} | ||
if let Some(init) = local.init { | ||
let init_ty = cx.typeck_results().expr_ty(init); | ||
let needs_drop = init_ty.needs_drop(cx.tcx, cx.param_env); | ||
a2aaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
let is_sync_lock = init_ty.walk().any(|inner| match inner.unpack() { | ||
GenericArgKind::Type(inner_ty) => { | ||
SYNC_GUARD_PATHS.iter().any(|guard_path| match inner_ty.kind() { | ||
ty::Adt(adt, _) => { | ||
let ty_path = cx.get_def_path(adt.did()); | ||
guard_path.iter().map(|x| Symbol::intern(x)).eq(ty_path.iter().copied()) | ||
} | ||
_ => false, | ||
}) | ||
} | ||
|
||
GenericArgKind::Lifetime(_) | GenericArgKind::Const(_) => false, | ||
}); | ||
let is_must_use_ty = is_must_use_ty(cx, cx.typeck_results().expr_ty(init)); | ||
let is_must_use_func_call = is_must_use_func_call(cx, init); | ||
|
||
if is_sync_lock { | ||
cx.struct_span_lint(LET_UNDERSCORE_LOCK, local.span, |lint| { | ||
build_and_emit_lint( | ||
lint, | ||
local, | ||
init.span, | ||
"non-binding let on a synchronization lock", | ||
) | ||
}) | ||
} else if is_must_use_ty || is_must_use_func_call { | ||
cx.struct_span_lint(LET_UNDERSCORE_MUST_USE, local.span, |lint| { | ||
build_and_emit_lint( | ||
lint, | ||
local, | ||
init.span, | ||
"non-binding let on a expression marked `must_use`", | ||
); | ||
}) | ||
} else if needs_drop { | ||
cx.struct_span_lint(LET_UNDERSCORE_DROP, local.span, |lint| { | ||
build_and_emit_lint( | ||
lint, | ||
local, | ||
init.span, | ||
"non-binding let on a type that implements `Drop`", | ||
); | ||
}) | ||
} | ||
} | ||
|
||
fn build_and_emit_lint( | ||
a2aaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
lint: LintDiagnosticBuilder<'_, ()>, | ||
local: &hir::Local<'_>, | ||
init_span: rustc_span::Span, | ||
msg: &str, | ||
) { | ||
lint.build(msg) | ||
.span_suggestion_verbose( | ||
local.pat.span, | ||
"consider binding to an unused variable", | ||
"_unused", | ||
Applicability::MachineApplicable, | ||
) | ||
.span_suggestion_verbose( | ||
init_span, | ||
"consider explicitly droping with `std::mem::drop`", | ||
"drop(...)", | ||
a2aaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Applicability::HasPlaceholders, | ||
) | ||
.emit(); | ||
} | ||
|
||
// return true if `ty` is a type that is marked as `must_use` | ||
fn is_must_use_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool { | ||
match ty.kind() { | ||
ty::Adt(adt, _) => has_must_use_attr(cx, adt.did()), | ||
ty::Foreign(ref did) => has_must_use_attr(cx, *did), | ||
ty::Slice(ty) | ||
| ty::Array(ty, _) | ||
| ty::RawPtr(ty::TypeAndMut { ty, .. }) | ||
| ty::Ref(_, ty, _) => { | ||
// for the Array case we don't need to care for the len == 0 case | ||
// because we don't want to lint functions returning empty arrays | ||
is_must_use_ty(cx, *ty) | ||
} | ||
ty::Tuple(substs) => substs.iter().any(|ty| is_must_use_ty(cx, ty)), | ||
ty::Opaque(ref def_id, _) => { | ||
for (predicate, _) in cx.tcx.explicit_item_bounds(*def_id) { | ||
if let ty::PredicateKind::Trait(trait_predicate) = | ||
predicate.kind().skip_binder() | ||
{ | ||
if has_must_use_attr(cx, trait_predicate.trait_ref.def_id) { | ||
return true; | ||
} | ||
} | ||
} | ||
false | ||
} | ||
ty::Dynamic(binder, _) => { | ||
for predicate in binder.iter() { | ||
if let ty::ExistentialPredicate::Trait(ref trait_ref) = | ||
predicate.skip_binder() | ||
{ | ||
if has_must_use_attr(cx, trait_ref.def_id) { | ||
return true; | ||
} | ||
} | ||
} | ||
false | ||
} | ||
_ => false, | ||
} | ||
} | ||
|
||
// check if expr is calling method or function with #[must_use] attribute | ||
fn is_must_use_func_call(cx: &LateContext<'_>, expr: &hir::Expr<'_>) -> bool { | ||
let did = match expr.kind { | ||
hir::ExprKind::Call(path, _) if let hir::ExprKind::Path(ref qpath) = path.kind => { | ||
if let hir::def::Res::Def(_, did) = cx.qpath_res(qpath, path.hir_id) { | ||
Some(did) | ||
} else { | ||
None | ||
} | ||
}, | ||
hir::ExprKind::MethodCall(..) => { | ||
cx.typeck_results().type_dependent_def_id(expr.hir_id) | ||
} | ||
_ => None, | ||
}; | ||
|
||
did.map_or(false, |did| has_must_use_attr(cx, did)) | ||
} | ||
|
||
// returns true if DefId contains a `#[must_use]` attribute | ||
fn has_must_use_attr(cx: &LateContext<'_>, did: hir::def_id::DefId) -> bool { | ||
cx.tcx | ||
.get_attrs(did, rustc_span::sym::must_use) | ||
.find(|a| a.has_name(rustc_span::sym::must_use)) | ||
a2aaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
.is_some() | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
// run-pass | ||
a2aaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// compile-flags: -W let_underscore_drop | ||
|
||
struct NontrivialDrop; | ||
|
||
impl Drop for NontrivialDrop { | ||
fn drop(&mut self) { | ||
println!("Dropping!"); | ||
} | ||
} | ||
|
||
fn main() { | ||
let _ = NontrivialDrop; //~WARNING non-binding let on a type that implements `Drop` | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
warning: non-binding let on a type that implements `Drop` | ||
--> $DIR/let_underscore_drop.rs:13:5 | ||
| | ||
LL | let _ = NontrivialDrop; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | ||
= note: requested on the command line with `-W let-underscore-drop` | ||
help: consider binding to an unused variable | ||
| | ||
LL | let _unused = NontrivialDrop; | ||
| ~~~~~~~ | ||
help: consider explicitly droping with `std::mem::drop` | ||
| | ||
LL | let _ = drop(...); | ||
| ~~~~~~~~~ | ||
|
||
warning: 1 warning emitted | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
use std::sync::{Arc, Mutex}; | ||
|
||
fn main() { | ||
let data = Arc::new(Mutex::new(0)); | ||
let _ = data.lock().unwrap(); //~ERROR non-binding let on a synchronization lock | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
error: non-binding let on a synchronization lock | ||
--> $DIR/let_underscore_lock.rs:5:5 | ||
| | ||
LL | let _ = data.lock().unwrap(); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | ||
= note: `#[deny(let_underscore_lock)]` on by default | ||
help: consider binding to an unused variable | ||
| | ||
LL | let _unused = data.lock().unwrap(); | ||
| ~~~~~~~ | ||
help: consider explicitly droping with `std::mem::drop` | ||
| | ||
LL | let _ = drop(...); | ||
| ~~~~~~~~~ | ||
|
||
error: aborting due to previous error | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
// run-pass | ||
// compile-flags: -W let_underscore_must_use | ||
|
||
#[must_use] | ||
struct MustUseType; | ||
|
||
#[must_use] | ||
fn must_use_function() -> () {} | ||
|
||
fn main() { | ||
let _ = MustUseType; //~WARNING non-binding let on a expression marked `must_use` | ||
let _ = must_use_function(); //~WARNING non-binding let on a expression marked `must_use` | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah! Can you push a new commit with this being
Deny
? That way we can do a crater run to see how bad this heuristic would actually be in the wild. Depending on the results of that run, we'd make this eitherWarn
orAllow
, as you have here.@joshtriplett this is necessary to catch all cases of the RAII pattern, but we need to verify what the S/N ratio is for the simplistic heuristic. Otherwise we'd need to extend
LET_UNDERSCORE_LOCK
to also check for the mutexes in parkinglot and tokio, at least.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done! I will note that this ends up triggering on code in the compiler itself, which I'm guessing means it's going to be extremely noisy.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@estebank I would hypothesize that
let _ = returns_type_implementing_drop()
is quite common, too much so to turn on by default.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Case in point:
:-/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@a2aaron this is a problem for what I wanted to do. Did you see how many cases are in the rustc repo? Because if
rustc
doesn't build, then we can't run crater to collect numbers on how many crates would suddenly start warning on this. I guess path inspecting against a denylist of common crates (or better, stabilizing an attribute that they can annotate with thatrustc
checks for) might be warranted in the end :-/There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@estebank There's a lot. Setting
let_underscore_drop
toWarn
and building with--warnings warn
turned on, I got 28 warnings. Most of these were instd
. It seems like 18 of them are caused by one macro (rtprintpanic!
).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's actually not as many as I thought there would be! 😅
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should I try manually fixing up all of those cases?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only if you have time, otherwise we can defer on that and focus on the specific denylist of std mutexes and leaving the "implicit
drop
" one as allow-by-default.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I'll defer on it--the lint is too noisy and annoying to fix up right now, and every instance of it firing has been on types where it really doesn't matter that it gets dropped earlier (it's firing on a lot of
Box
s or variousResult
types). I've pushed a commit makinglet_underscore_drop
allow by default for now.