mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-23 21:23:56 +00:00
Auto merge of #11451 - y21:issue11408, r=xFrednet
[`slow_vector_initialization`]: use the source span of vec![] macro and fix another FP Fixes #11408 <details> <summary>Also fixes a FP when the vec initializer comes from a macro other than `vec![]`</summary> ```rs macro_rules! x { () => { vec![] } } fn f() { let mut v = x!(); v.resize(10, 0); } ``` This shouldn't warn. The `x!` macro might be doing other things, so just replacing `x!()` with `vec![0; 10]` is not always an option. </details> I added some test cases for macro expansions, however I don't think there's a way to write a test for that specific warning that appeared in the linked issue. As far as I understand, that happens when the rust-src rustup component isn't installed (so the stdlib source is unavailable) and the span points to the `vec![]` *expansion*, instead of the `vec![]` that the user wrote. changelog: [`slow_vector_initialization`]: use the source span of `vec![]` macro changelog: [`slow_vector_initialization`]: only warn on `vec![]` expansions and allow other macros
This commit is contained in:
commit
415ba21c3b
3 changed files with 36 additions and 4 deletions
|
@ -1,4 +1,5 @@
|
||||||
use clippy_utils::diagnostics::span_lint_and_then;
|
use clippy_utils::diagnostics::span_lint_and_then;
|
||||||
|
use clippy_utils::macros::root_macro_call;
|
||||||
use clippy_utils::sugg::Sugg;
|
use clippy_utils::sugg::Sugg;
|
||||||
use clippy_utils::{
|
use clippy_utils::{
|
||||||
get_enclosing_block, is_expr_path_def_path, is_integer_literal, is_path_diagnostic_item, path_to_local,
|
get_enclosing_block, is_expr_path_def_path, is_integer_literal, is_path_diagnostic_item, path_to_local,
|
||||||
|
@ -148,6 +149,15 @@ impl SlowVectorInit {
|
||||||
/// - `Some(InitializedSize::Uninitialized)` for `Vec::new()`
|
/// - `Some(InitializedSize::Uninitialized)` for `Vec::new()`
|
||||||
/// - `None` for other, unrelated kinds of expressions
|
/// - `None` for other, unrelated kinds of expressions
|
||||||
fn as_vec_initializer<'tcx>(cx: &LateContext<'_>, expr: &'tcx Expr<'tcx>) -> Option<InitializedSize<'tcx>> {
|
fn as_vec_initializer<'tcx>(cx: &LateContext<'_>, expr: &'tcx Expr<'tcx>) -> Option<InitializedSize<'tcx>> {
|
||||||
|
// Generally don't warn if the vec initializer comes from an expansion, except for the vec! macro.
|
||||||
|
// This lets us still warn on `vec![]`, while ignoring other kinds of macros that may output an
|
||||||
|
// empty vec
|
||||||
|
if expr.span.from_expansion()
|
||||||
|
&& root_macro_call(expr.span).map(|m| m.def_id) != cx.tcx.get_diagnostic_item(sym::vec_macro)
|
||||||
|
{
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
if let ExprKind::Call(func, [len_expr]) = expr.kind
|
if let ExprKind::Call(func, [len_expr]) = expr.kind
|
||||||
&& is_expr_path_def_path(cx, func, &paths::VEC_WITH_CAPACITY)
|
&& is_expr_path_def_path(cx, func, &paths::VEC_WITH_CAPACITY)
|
||||||
{
|
{
|
||||||
|
@ -205,7 +215,7 @@ impl SlowVectorInit {
|
||||||
|
|
||||||
span_lint_and_then(cx, SLOW_VECTOR_INITIALIZATION, slow_fill.span, msg, |diag| {
|
span_lint_and_then(cx, SLOW_VECTOR_INITIALIZATION, slow_fill.span, msg, |diag| {
|
||||||
diag.span_suggestion(
|
diag.span_suggestion(
|
||||||
vec_alloc.allocation_expr.span,
|
vec_alloc.allocation_expr.span.source_callsite(),
|
||||||
"consider replacing this with",
|
"consider replacing this with",
|
||||||
format!("vec![0; {len_expr}]"),
|
format!("vec![0; {len_expr}]"),
|
||||||
Applicability::Unspecified,
|
Applicability::Unspecified,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
use std::iter::repeat;
|
|
||||||
//@no-rustfix
|
//@no-rustfix
|
||||||
|
use std::iter::repeat;
|
||||||
fn main() {
|
fn main() {
|
||||||
resize_vector();
|
resize_vector();
|
||||||
extend_vector();
|
extend_vector();
|
||||||
|
@ -86,6 +86,20 @@ fn from_empty_vec() {
|
||||||
vec1 = Vec::new();
|
vec1 = Vec::new();
|
||||||
vec1.resize(10, 0);
|
vec1.resize(10, 0);
|
||||||
//~^ ERROR: slow zero-filling initialization
|
//~^ ERROR: slow zero-filling initialization
|
||||||
|
|
||||||
|
vec1 = vec![];
|
||||||
|
vec1.resize(10, 0);
|
||||||
|
//~^ ERROR: slow zero-filling initialization
|
||||||
|
|
||||||
|
macro_rules! x {
|
||||||
|
() => {
|
||||||
|
vec![]
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// `vec![]` comes from another macro, don't warn
|
||||||
|
vec1 = x!();
|
||||||
|
vec1.resize(10, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn do_stuff(vec: &mut [u8]) {}
|
fn do_stuff(vec: &mut [u8]) {}
|
||||||
|
|
|
@ -96,13 +96,21 @@ LL | vec1 = Vec::new();
|
||||||
LL | vec1.resize(10, 0);
|
LL | vec1.resize(10, 0);
|
||||||
| ^^^^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: slow zero-filling initialization
|
||||||
|
--> $DIR/slow_vector_initialization.rs:91:5
|
||||||
|
|
|
||||||
|
LL | vec1 = vec![];
|
||||||
|
| ------ help: consider replacing this with: `vec![0; 10]`
|
||||||
|
LL | vec1.resize(10, 0);
|
||||||
|
| ^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
error: this argument is a mutable reference, but not used mutably
|
error: this argument is a mutable reference, but not used mutably
|
||||||
--> $DIR/slow_vector_initialization.rs:91:18
|
--> $DIR/slow_vector_initialization.rs:105:18
|
||||||
|
|
|
|
||||||
LL | fn do_stuff(vec: &mut [u8]) {}
|
LL | fn do_stuff(vec: &mut [u8]) {}
|
||||||
| ^^^^^^^^^ help: consider changing to: `&[u8]`
|
| ^^^^^^^^^ help: consider changing to: `&[u8]`
|
||||||
|
|
|
|
||||||
= note: `-D clippy::needless-pass-by-ref-mut` implied by `-D warnings`
|
= note: `-D clippy::needless-pass-by-ref-mut` implied by `-D warnings`
|
||||||
|
|
||||||
error: aborting due to 13 previous errors
|
error: aborting due to 14 previous errors
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue