2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::diagnostics::span_lint_and_help;
|
2021-08-08 14:49:13 +00:00
|
|
|
use clippy_utils::higher;
|
2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::ty::is_type_diagnostic_item;
|
|
|
|
use clippy_utils::SpanlessEq;
|
2020-04-15 20:22:28 +00:00
|
|
|
use if_chain::if_chain;
|
2020-03-18 22:13:06 +00:00
|
|
|
use rustc_hir::intravisit::{self as visit, NestedVisitorMap, Visitor};
|
2021-08-08 14:49:13 +00:00
|
|
|
use rustc_hir::{Expr, ExprKind};
|
2020-03-05 13:36:19 +00:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2020-03-30 18:53:27 +00:00
|
|
|
use rustc_middle::hir::map::Map;
|
2020-03-05 13:36:19 +00:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2021-10-02 23:51:01 +00:00
|
|
|
use rustc_span::sym;
|
2020-03-05 13:36:19 +00:00
|
|
|
|
|
|
|
declare_clippy_lint! {
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for `Mutex::lock` calls in `if let` expression
|
2020-03-05 13:36:19 +00:00
|
|
|
/// with lock calls in any of the else blocks.
|
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// The Mutex lock remains held for the whole
|
2020-03-05 13:36:19 +00:00
|
|
|
/// `if let ... else` block and deadlocks.
|
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Example
|
2020-03-18 01:51:43 +00:00
|
|
|
/// ```rust,ignore
|
2020-03-05 13:36:19 +00:00
|
|
|
/// if let Ok(thing) = mutex.lock() {
|
|
|
|
/// do_thing();
|
|
|
|
/// } else {
|
|
|
|
/// mutex.lock();
|
|
|
|
/// }
|
|
|
|
/// ```
|
2020-03-18 01:51:43 +00:00
|
|
|
/// Should be written
|
|
|
|
/// ```rust,ignore
|
|
|
|
/// let locked = mutex.lock();
|
|
|
|
/// if let Ok(thing) = locked {
|
|
|
|
/// do_thing(thing);
|
|
|
|
/// } else {
|
|
|
|
/// use_locked(locked);
|
|
|
|
/// }
|
|
|
|
/// ```
|
Added `clippy::version` attribute to all normal lints
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`...
And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun...
Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work.
```nu
mv v0.0.212 rust-1.00.0;
mv beta rust-1.57.0;
mv master rust-1.58.0;
let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path);
let versions = (
ls | where name =~ "rust-" | select name | format {name}/lints.json |
each { open $it | select id | insert version $it | str substring "5,11" version} |
group-by id | rotate counter-clockwise id version |
update version {get version | first 1} | flatten | select id version);
$paths | each { |row|
let version = ($versions | where id == ($row.id) | format {version})
let idu = ($row.id | str upcase)
$"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)"
} | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh";
```
And this still has some problems, but at this point I just want to be done -.-
2021-10-21 19:06:26 +00:00
|
|
|
#[clippy::version = "1.45.0"]
|
2020-03-05 13:36:19 +00:00
|
|
|
pub IF_LET_MUTEX,
|
|
|
|
correctness,
|
2020-03-05 23:02:22 +00:00
|
|
|
"locking a `Mutex` in an `if let` block can cause deadlocks"
|
2020-03-05 13:36:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
declare_lint_pass!(IfLetMutex => [IF_LET_MUTEX]);
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for IfLetMutex {
|
2021-08-08 14:49:13 +00:00
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
|
2020-03-18 22:13:06 +00:00
|
|
|
let mut arm_visit = ArmVisitor {
|
2020-04-15 20:22:28 +00:00
|
|
|
mutex_lock_called: false,
|
2020-04-15 21:08:26 +00:00
|
|
|
found_mutex: None,
|
2020-03-18 22:13:06 +00:00
|
|
|
cx,
|
|
|
|
};
|
2020-03-18 22:33:59 +00:00
|
|
|
let mut op_visit = OppVisitor {
|
2020-04-15 20:22:28 +00:00
|
|
|
mutex_lock_called: false,
|
2020-04-15 21:08:26 +00:00
|
|
|
found_mutex: None,
|
2020-03-18 22:13:06 +00:00
|
|
|
cx,
|
|
|
|
};
|
2021-08-08 14:49:13 +00:00
|
|
|
if let Some(higher::IfLet {
|
|
|
|
let_expr,
|
|
|
|
if_then,
|
|
|
|
if_else: Some(if_else),
|
|
|
|
..
|
2021-08-19 18:31:25 +00:00
|
|
|
}) = higher::IfLet::hir(cx, expr)
|
2020-03-18 22:13:06 +00:00
|
|
|
{
|
2021-08-08 14:49:13 +00:00
|
|
|
op_visit.visit_expr(let_expr);
|
2020-04-15 20:22:28 +00:00
|
|
|
if op_visit.mutex_lock_called {
|
2021-08-08 14:49:13 +00:00
|
|
|
arm_visit.visit_expr(if_then);
|
|
|
|
arm_visit.visit_expr(if_else);
|
2020-03-05 13:36:19 +00:00
|
|
|
|
2020-04-15 21:08:26 +00:00
|
|
|
if arm_visit.mutex_lock_called && arm_visit.same_mutex(cx, op_visit.found_mutex.unwrap()) {
|
2020-03-18 22:13:06 +00:00
|
|
|
span_lint_and_help(
|
|
|
|
cx,
|
|
|
|
IF_LET_MUTEX,
|
2021-08-08 14:49:13 +00:00
|
|
|
expr.span,
|
2020-03-18 22:13:06 +00:00
|
|
|
"calling `Mutex::lock` inside the scope of another `Mutex::lock` causes a deadlock",
|
2020-04-20 10:49:59 +00:00
|
|
|
None,
|
2020-03-18 22:13:06 +00:00
|
|
|
"move the lock call outside of the `if let ...` expression",
|
|
|
|
);
|
|
|
|
}
|
2020-03-05 13:36:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-07-01 16:17:38 +00:00
|
|
|
/// Checks if `Mutex::lock` is called in the `if let` expr.
|
2020-06-25 20:41:36 +00:00
|
|
|
pub struct OppVisitor<'a, 'tcx> {
|
2020-04-15 21:08:26 +00:00
|
|
|
mutex_lock_called: bool,
|
|
|
|
found_mutex: Option<&'tcx Expr<'tcx>>,
|
2020-06-25 20:41:36 +00:00
|
|
|
cx: &'a LateContext<'tcx>,
|
2020-03-18 19:20:01 +00:00
|
|
|
}
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> Visitor<'tcx> for OppVisitor<'_, 'tcx> {
|
2020-03-18 22:13:06 +00:00
|
|
|
type Map = Map<'tcx>;
|
|
|
|
|
|
|
|
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
|
2021-04-08 15:50:13 +00:00
|
|
|
if let Some(mutex) = is_mutex_lock_call(self.cx, expr) {
|
|
|
|
self.found_mutex = Some(mutex);
|
|
|
|
self.mutex_lock_called = true;
|
|
|
|
return;
|
2020-03-18 22:13:06 +00:00
|
|
|
}
|
|
|
|
visit::walk_expr(self, expr);
|
2020-03-18 19:20:01 +00:00
|
|
|
}
|
2020-03-18 22:13:06 +00:00
|
|
|
|
|
|
|
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
|
|
|
|
NestedVisitorMap::None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Checks if `Mutex::lock` is called in any of the branches.
|
2020-06-25 20:41:36 +00:00
|
|
|
pub struct ArmVisitor<'a, 'tcx> {
|
2020-04-15 21:08:26 +00:00
|
|
|
mutex_lock_called: bool,
|
|
|
|
found_mutex: Option<&'tcx Expr<'tcx>>,
|
2020-06-25 20:41:36 +00:00
|
|
|
cx: &'a LateContext<'tcx>,
|
2020-03-18 19:20:01 +00:00
|
|
|
}
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> Visitor<'tcx> for ArmVisitor<'_, 'tcx> {
|
2020-03-18 22:13:06 +00:00
|
|
|
type Map = Map<'tcx>;
|
|
|
|
|
2020-04-15 21:08:26 +00:00
|
|
|
fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
|
2021-04-08 15:50:13 +00:00
|
|
|
if let Some(mutex) = is_mutex_lock_call(self.cx, expr) {
|
|
|
|
self.found_mutex = Some(mutex);
|
|
|
|
self.mutex_lock_called = true;
|
|
|
|
return;
|
2020-03-05 13:36:19 +00:00
|
|
|
}
|
2020-03-18 22:13:06 +00:00
|
|
|
visit::walk_expr(self, expr);
|
2020-03-05 13:36:19 +00:00
|
|
|
}
|
2020-03-18 01:51:43 +00:00
|
|
|
|
2020-03-18 22:13:06 +00:00
|
|
|
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
|
|
|
|
NestedVisitorMap::None
|
2020-03-18 01:51:43 +00:00
|
|
|
}
|
|
|
|
}
|
2020-04-15 21:08:26 +00:00
|
|
|
|
2020-07-14 12:59:59 +00:00
|
|
|
impl<'tcx, 'l> ArmVisitor<'tcx, 'l> {
|
2020-06-25 20:41:36 +00:00
|
|
|
fn same_mutex(&self, cx: &LateContext<'_>, op_mutex: &Expr<'_>) -> bool {
|
2020-07-14 12:59:59 +00:00
|
|
|
self.found_mutex
|
|
|
|
.map_or(false, |arm_mutex| SpanlessEq::new(cx).eq_expr(op_mutex, arm_mutex))
|
2020-04-15 21:08:26 +00:00
|
|
|
}
|
|
|
|
}
|
2020-04-20 19:08:44 +00:00
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
fn is_mutex_lock_call<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Option<&'tcx Expr<'tcx>> {
|
2020-04-20 19:08:44 +00:00
|
|
|
if_chain! {
|
2021-09-08 14:31:47 +00:00
|
|
|
if let ExprKind::MethodCall(path, _span, [self_arg, ..], _) = &expr.kind;
|
2021-01-15 09:56:44 +00:00
|
|
|
if path.ident.as_str() == "lock";
|
2021-09-08 14:31:47 +00:00
|
|
|
let ty = cx.typeck_results().expr_ty(self_arg);
|
2021-10-02 23:51:01 +00:00
|
|
|
if is_type_diagnostic_item(cx, ty, sym::Mutex);
|
2020-04-20 19:08:44 +00:00
|
|
|
then {
|
2021-09-08 14:31:47 +00:00
|
|
|
Some(self_arg)
|
2020-04-20 19:08:44 +00:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|