-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
285 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,141 @@ | ||
use clippy_utils::diagnostics::span_lint; | ||
use clippy_utils::{match_def_path, meets_msrv, msrvs, paths, visitors::expr_visitor_no_bodies}; | ||
use rustc_hir::{intravisit::Visitor, Block, ExprKind, QPath, StmtKind}; | ||
use rustc_lint::{LateContext, LateLintPass}; | ||
use rustc_middle::ty; | ||
use rustc_semver::RustcVersion; | ||
use rustc_session::{declare_tool_lint, impl_lint_pass}; | ||
use rustc_span::sym; | ||
|
||
declare_clippy_lint! { | ||
/// ### What it does | ||
/// This lint checks for `reserve` before calling the `extend` method. | ||
/// ### Why is this bad? | ||
/// vec::reserve method before vec::extend is no longer makes sense in rustc version >= 1.62 | ||
/// ### Example | ||
/// ```rust | ||
/// let mut vec: Vec<usize> = vec![]; | ||
/// let array: &[usize] = &[1, 2]; | ||
/// vec.reserve(array.len()); | ||
/// vec.extend(array); | ||
/// ``` | ||
/// Use instead: | ||
/// ```rust | ||
/// let mut vec: Vec<usize> = vec![]; | ||
/// let array: &[usize] = &[1, 2]; | ||
/// vec.extend(array); | ||
/// ``` | ||
#[clippy::version = "1.64.0"] | ||
pub UNNECESSARY_RESERVE, | ||
pedantic, | ||
"`reserve` method before `extend` is no longer makes sense in rustc version >= 1.62" | ||
} | ||
|
||
pub struct UnnecessaryReserve { | ||
msrv: Option<RustcVersion>, | ||
} | ||
|
||
impl UnnecessaryReserve { | ||
#[must_use] | ||
pub fn new(msrv: Option<RustcVersion>) -> Self { | ||
Self { msrv } | ||
} | ||
} | ||
|
||
impl_lint_pass!(UnnecessaryReserve => [UNNECESSARY_RESERVE]); | ||
|
||
impl<'tcx> LateLintPass<'tcx> for UnnecessaryReserve { | ||
fn check_block(&mut self, cx: &LateContext<'tcx>, block: &Block<'tcx>) { | ||
if !meets_msrv(self.msrv, msrvs::UNNECESSARY_RESERVE) { | ||
return; | ||
} | ||
|
||
for (idx, stmt) in block.stmts.iter().enumerate() { | ||
if let StmtKind::Semi(semi_expr) = stmt.kind | ||
&& let ExprKind::MethodCall(_, [struct_calling_on, _], _) = semi_expr.kind | ||
&& let Some(expr_def_id) = cx.typeck_results().type_dependent_def_id(semi_expr.hir_id) | ||
&& (match_def_path(cx, expr_def_id, &paths::VEC_RESERVE) || | ||
match_def_path(cx, expr_def_id, &paths::VEC_DEQUE_RESERVE)) | ||
&& acceptable_type(cx, struct_calling_on) | ||
&& let Some(next_stmt_span) = check_extend_method(cx, block, idx, struct_calling_on) | ||
&& !next_stmt_span.from_expansion() | ||
{ | ||
span_lint( | ||
cx, | ||
UNNECESSARY_RESERVE, | ||
next_stmt_span, | ||
"this `reserve` no longer makes sense in rustc version >= 1.62", | ||
); | ||
} | ||
} | ||
} | ||
|
||
extract_msrv_attr!(LateContext); | ||
} | ||
|
||
#[must_use] | ||
fn acceptable_type(cx: &LateContext<'_>, struct_calling_on: &rustc_hir::Expr<'_>) -> bool { | ||
let acceptable_types = [sym::Vec, sym::VecDeque]; | ||
acceptable_types.iter().any(|&acceptable_ty| { | ||
match cx.typeck_results().expr_ty(struct_calling_on).peel_refs().kind() { | ||
ty::Adt(def, _) => cx.tcx.is_diagnostic_item(acceptable_ty, def.did()), | ||
_ => false, | ||
} | ||
}) | ||
} | ||
|
||
#[must_use] | ||
fn check_extend_method( | ||
cx: &LateContext<'_>, | ||
block: &Block<'_>, | ||
idx: usize, | ||
struct_expr: &rustc_hir::Expr<'_>, | ||
) -> Option<rustc_span::Span> { | ||
let mut read_found = false; | ||
let next_stmt_span; | ||
|
||
let mut visitor = expr_visitor_no_bodies(|expr| { | ||
if let ExprKind::MethodCall(_, [struct_calling_on, _], _) = expr.kind | ||
&& let Some(expr_def_id) = cx.typeck_results().type_dependent_def_id(expr.hir_id) | ||
&& match_def_path(cx, expr_def_id, &paths::ITER_EXTEND) | ||
&& acceptable_type(cx, struct_calling_on) | ||
&& equal_ident(struct_calling_on, struct_expr) | ||
{ | ||
read_found = true; | ||
} | ||
!read_found | ||
}); | ||
|
||
if idx == block.stmts.len() - 1 { | ||
if let Some(e) = block.expr { | ||
visitor.visit_expr(e); | ||
next_stmt_span = e.span; | ||
} else { | ||
return None; | ||
} | ||
} else { | ||
let next_stmt = &block.stmts[idx + 1]; | ||
visitor.visit_stmt(next_stmt); | ||
next_stmt_span = next_stmt.span; | ||
} | ||
drop(visitor); | ||
|
||
if read_found { | ||
return Some(next_stmt_span); | ||
} | ||
|
||
None | ||
} | ||
|
||
#[must_use] | ||
fn equal_ident(left: &rustc_hir::Expr<'_>, right: &rustc_hir::Expr<'_>) -> bool { | ||
fn ident_name(expr: &rustc_hir::Expr<'_>) -> Option<rustc_span::Symbol> { | ||
if let ExprKind::Path(QPath::Resolved(None, inner_path)) = expr.kind | ||
&& let [inner_seg] = inner_path.segments { | ||
return Some(inner_seg.ident.name); | ||
} | ||
None | ||
} | ||
|
||
ident_name(left) == ident_name(right) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
#![warn(clippy::unnecessary_reserve)] | ||
#![feature(custom_inner_attributes)] | ||
|
||
use std::collections::HashMap; | ||
use std::collections::VecDeque; | ||
|
||
fn main() { | ||
vec_reserve(); | ||
vec_deque_reserve(); | ||
hash_map_reserve(); | ||
msrv_1_62(); | ||
} | ||
|
||
fn vec_reserve() { | ||
let mut vec: Vec<usize> = vec![]; | ||
let array: &[usize] = &[1, 2]; | ||
|
||
// do lint | ||
vec.reserve(1); | ||
vec.extend([1]); | ||
|
||
// do lint | ||
vec.reserve(array.len()); | ||
vec.extend(array); | ||
|
||
// do lint | ||
{ | ||
vec.reserve(1); | ||
vec.extend([1]) | ||
}; | ||
|
||
// do not lint | ||
vec.reserve(array.len()); | ||
vec.push(1); | ||
vec.extend(array); | ||
|
||
// do not lint | ||
let mut other_vec: Vec<usize> = vec![]; | ||
other_vec.reserve(1); | ||
vec.extend([1]) | ||
} | ||
|
||
fn vec_deque_reserve() { | ||
let mut vec_deque: VecDeque<usize> = [1].into(); | ||
let array: &[usize] = &[1, 2]; | ||
|
||
// do lint | ||
vec_deque.reserve(1); | ||
vec_deque.extend([1]); | ||
|
||
// do lint | ||
vec_deque.reserve(array.len()); | ||
vec_deque.extend(array); | ||
|
||
// do lint | ||
{ | ||
vec_deque.reserve(1); | ||
vec_deque.extend([1]) | ||
}; | ||
|
||
// do not lint | ||
vec_deque.reserve(array.len() + 1); | ||
vec_deque.push_back(1); | ||
vec_deque.extend(array); | ||
|
||
// do not lint | ||
let mut other_vec_deque: VecDeque<usize> = [1].into(); | ||
other_vec_deque.reserve(1); | ||
vec_deque.extend([1]) | ||
} | ||
|
||
fn hash_map_reserve() { | ||
let mut map: HashMap<usize, usize> = HashMap::new(); | ||
let mut other_map: HashMap<usize, usize> = HashMap::new(); | ||
// do not lint | ||
map.reserve(other_map.len()); | ||
map.extend(other_map); | ||
} | ||
|
||
fn msrv_1_62() { | ||
#![clippy::msrv = "1.61"] | ||
let mut vec: Vec<usize> = vec![]; | ||
let array: &[usize] = &[1, 2]; | ||
|
||
// do not lint | ||
vec.reserve(1); | ||
vec.extend([1]); | ||
|
||
let mut vec_deque: VecDeque<usize> = [1].into(); | ||
let array: &[usize] = &[1, 2]; | ||
|
||
// do not lint | ||
vec_deque.reserve(1); | ||
vec_deque.extend([1]); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
error: this `reserve` no longer makes sense in rustc version >= 1.62 | ||
--> $DIR/unnecessary_reserve.rs:20:5 | ||
| | ||
LL | vec.extend([1]); | ||
| ^^^^^^^^^^^^^^^^ | ||
| | ||
= note: `-D clippy::unnecessary-reserve` implied by `-D warnings` | ||
|
||
error: this `reserve` no longer makes sense in rustc version >= 1.62 | ||
--> $DIR/unnecessary_reserve.rs:24:5 | ||
| | ||
LL | vec.extend(array); | ||
| ^^^^^^^^^^^^^^^^^^ | ||
|
||
error: this `reserve` no longer makes sense in rustc version >= 1.62 | ||
--> $DIR/unnecessary_reserve.rs:29:9 | ||
| | ||
LL | vec.extend([1]) | ||
| ^^^^^^^^^^^^^^^ | ||
|
||
error: this `reserve` no longer makes sense in rustc version >= 1.62 | ||
--> $DIR/unnecessary_reserve.rs:49:5 | ||
| | ||
LL | vec_deque.extend([1]); | ||
| ^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: this `reserve` no longer makes sense in rustc version >= 1.62 | ||
--> $DIR/unnecessary_reserve.rs:53:5 | ||
| | ||
LL | vec_deque.extend(array); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: this `reserve` no longer makes sense in rustc version >= 1.62 | ||
--> $DIR/unnecessary_reserve.rs:58:9 | ||
| | ||
LL | vec_deque.extend([1]) | ||
| ^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: aborting due to 6 previous errors | ||
|