Skip to content
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

new lint [single_range_in_vec_init] #10934

Merged
merged 2 commits into from
Jun 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5164,6 +5164,7 @@ Released 2018-09-13
[`single_element_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_element_loop
[`single_match`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_match
[`single_match_else`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_match_else
[`single_range_in_vec_init`]: https://rust-lang.github.io/rust-clippy/master/index.html#single_range_in_vec_init
[`size_of_in_element_count`]: https://rust-lang.github.io/rust-clippy/master/index.html#size_of_in_element_count
[`size_of_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#size_of_ref
[`skip_while_next`]: https://rust-lang.github.io/rust-clippy/master/index.html#skip_while_next
Expand Down
1 change: 1 addition & 0 deletions clippy_lints/src/declared_lints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
crate::significant_drop_tightening::SIGNIFICANT_DROP_TIGHTENING_INFO,
crate::single_char_lifetime_names::SINGLE_CHAR_LIFETIME_NAMES_INFO,
crate::single_component_path_imports::SINGLE_COMPONENT_PATH_IMPORTS_INFO,
crate::single_range_in_vec_init::SINGLE_RANGE_IN_VEC_INIT_INFO,
crate::size_of_in_element_count::SIZE_OF_IN_ELEMENT_COUNT_INFO,
crate::size_of_ref::SIZE_OF_REF_INFO,
crate::slow_vector_initialization::SLOW_VECTOR_INITIALIZATION_INFO,
Expand Down
2 changes: 2 additions & 0 deletions clippy_lints/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ mod shadow;
mod significant_drop_tightening;
mod single_char_lifetime_names;
mod single_component_path_imports;
mod single_range_in_vec_init;
mod size_of_in_element_count;
mod size_of_ref;
mod slow_vector_initialization;
Expand Down Expand Up @@ -1045,6 +1046,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
});
let stack_size_threshold = conf.stack_size_threshold;
store.register_late_pass(move |_| Box::new(large_stack_frames::LargeStackFrames::new(stack_size_threshold)));
store.register_late_pass(|_| Box::new(single_range_in_vec_init::SingleRangeInVecInit));
// add lints here, do not remove this comment, it's used in `new_lint`
}

Expand Down
147 changes: 147 additions & 0 deletions clippy_lints/src/single_range_in_vec_init.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
use clippy_utils::{
diagnostics::span_lint_and_then, get_trait_def_id, higher::VecArgs, macros::root_macro_call_first_node,
source::snippet_opt, ty::implements_trait,
};
use rustc_ast::{LitIntType, LitKind, UintTy};
use rustc_errors::Applicability;
use rustc_hir::{Expr, ExprKind, LangItem, QPath};
use rustc_lint::{LateContext, LateLintPass};
use rustc_session::{declare_lint_pass, declare_tool_lint};
use std::fmt::{self, Display, Formatter};

declare_clippy_lint! {
/// ### What it does
/// Checks for `Vec` or array initializations that contain only one range.
///
/// ### Why is this bad?
/// This is almost always incorrect, as it will result in a `Vec` that has only one element.
/// Almost always, the programmer intended for it to include all elements in the range or for
/// the end of the range to be the length instead.
///
/// ### Example
/// ```rust
/// let x = [0..200];
/// ```
/// Use instead:
/// ```rust
/// // If it was intended to include every element in the range...
/// let x = (0..200).collect::<Vec<i32>>();
/// // ...Or if 200 was meant to be the len
/// let x = [0; 200];
/// ```
#[clippy::version = "1.72.0"]
pub SINGLE_RANGE_IN_VEC_INIT,
suspicious,
"checks for initialization of `Vec` or arrays which consist of a single range"
}
declare_lint_pass!(SingleRangeInVecInit => [SINGLE_RANGE_IN_VEC_INIT]);

enum SuggestedType {
Vec,
Array,
}

impl SuggestedType {
fn starts_with(&self) -> &'static str {
if matches!(self, SuggestedType::Vec) {
"vec!"
} else {
"["
}
}

fn ends_with(&self) -> &'static str {
if matches!(self, SuggestedType::Vec) { "" } else { "]" }
}
}

impl Display for SuggestedType {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
if matches!(&self, SuggestedType::Vec) {
write!(f, "a `Vec`")
} else {
write!(f, "an array")
}
}
}

impl LateLintPass<'_> for SingleRangeInVecInit {
fn check_expr<'tcx>(&mut self, cx: &LateContext<'tcx>, expr: &Expr<'tcx>) {
// inner_expr: `vec![0..200]` or `[0..200]`
// ^^^^^^ ^^^^^^^
// span: `vec![0..200]` or `[0..200]`
// ^^^^^^^^^^^^ ^^^^^^^^
// suggested_type: What to print, "an array" or "a `Vec`"
let (inner_expr, span, suggested_type) = if let ExprKind::Array([inner_expr]) = expr.kind
&& !expr.span.from_expansion()
{
(inner_expr, expr.span, SuggestedType::Array)
} else if let Some(macro_call) = root_macro_call_first_node(cx, expr)
&& let Some(VecArgs::Vec([expr])) = VecArgs::hir(cx, expr)
{
(expr, macro_call.span, SuggestedType::Vec)
} else {
return;
};

let ExprKind::Struct(QPath::LangItem(lang_item, ..), [start, end], None) = inner_expr.kind else {
return;
};

if matches!(lang_item, LangItem::Range)
&& let ty = cx.typeck_results().expr_ty(start.expr)
&& let Some(snippet) = snippet_opt(cx, span)
// `is_from_proc_macro` will skip any `vec![]`. Let's not!
&& snippet.starts_with(suggested_type.starts_with())
&& snippet.ends_with(suggested_type.ends_with())
&& let Some(start_snippet) = snippet_opt(cx, start.span)
&& let Some(end_snippet) = snippet_opt(cx, end.span)
{
let should_emit_every_value = if let Some(step_def_id) = get_trait_def_id(cx, &["core", "iter", "Step"])
&& implements_trait(cx, ty, step_def_id, &[])
{
true
} else {
false
};
let should_emit_of_len = if let Some(copy_def_id) = cx.tcx.lang_items().copy_trait()
&& implements_trait(cx, ty, copy_def_id, &[])
&& let ExprKind::Lit(lit_kind) = end.expr.kind
&& let LitKind::Int(.., suffix_type) = lit_kind.node
&& let LitIntType::Unsigned(UintTy::Usize) | LitIntType::Unsuffixed = suffix_type
{
true
} else {
false
};

if should_emit_every_value || should_emit_of_len {
span_lint_and_then(
cx,
SINGLE_RANGE_IN_VEC_INIT,
span,
&format!("{suggested_type} of `Range` that is only one element"),
|diag| {
if should_emit_every_value {
diag.span_suggestion(
span,
"if you wanted a `Vec` that contains the entire range, try",
format!("({start_snippet}..{end_snippet}).collect::<std::vec::Vec<{ty}>>()"),
Applicability::MaybeIncorrect,
);
}

if should_emit_of_len {
diag.span_suggestion(
inner_expr.span,
format!("if you wanted {suggested_type} of len {end_snippet}, try"),
format!("{start_snippet}; {end_snippet}"),
Applicability::MaybeIncorrect,
);
}
},
);
}
}
}
}
2 changes: 2 additions & 0 deletions tests/ui/single_element_loop.fixed
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
//@run-rustfix
// Tests from for_loop.rs that don't have suggestions

#![allow(clippy::single_range_in_vec_init)]

#[warn(clippy::single_element_loop)]
fn main() {
let item1 = 2;
Expand Down
2 changes: 2 additions & 0 deletions tests/ui/single_element_loop.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
//@run-rustfix
// Tests from for_loop.rs that don't have suggestions

#![allow(clippy::single_range_in_vec_init)]

#[warn(clippy::single_element_loop)]
fn main() {
let item1 = 2;
Expand Down
14 changes: 7 additions & 7 deletions tests/ui/single_element_loop.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: for loop over a single element
--> $DIR/single_element_loop.rs:7:5
--> $DIR/single_element_loop.rs:9:5
|
LL | / for item in &[item1] {
LL | | dbg!(item);
Expand All @@ -16,7 +16,7 @@ LL + }
|

error: for loop over a single element
--> $DIR/single_element_loop.rs:11:5
--> $DIR/single_element_loop.rs:13:5
|
LL | / for item in [item1].iter() {
LL | | dbg!(item);
Expand All @@ -32,7 +32,7 @@ LL + }
|

error: for loop over a single element
--> $DIR/single_element_loop.rs:15:5
--> $DIR/single_element_loop.rs:17:5
|
LL | / for item in &[0..5] {
LL | | dbg!(item);
Expand All @@ -48,7 +48,7 @@ LL + }
|

error: for loop over a single element
--> $DIR/single_element_loop.rs:19:5
--> $DIR/single_element_loop.rs:21:5
|
LL | / for item in [0..5].iter_mut() {
LL | | dbg!(item);
Expand All @@ -64,7 +64,7 @@ LL + }
|

error: for loop over a single element
--> $DIR/single_element_loop.rs:23:5
--> $DIR/single_element_loop.rs:25:5
|
LL | / for item in [0..5] {
LL | | dbg!(item);
Expand All @@ -80,7 +80,7 @@ LL + }
|

error: for loop over a single element
--> $DIR/single_element_loop.rs:27:5
--> $DIR/single_element_loop.rs:29:5
|
LL | / for item in [0..5].into_iter() {
LL | | dbg!(item);
Expand All @@ -96,7 +96,7 @@ LL + }
|

error: for loop over a single element
--> $DIR/single_element_loop.rs:46:5
--> $DIR/single_element_loop.rs:48:5
|
LL | / for _ in [42] {
LL | | let _f = |n: u32| {
Expand Down
58 changes: 58 additions & 0 deletions tests/ui/single_range_in_vec_init.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
//@aux-build:proc_macros.rs
#![allow(clippy::no_effect, clippy::useless_vec, unused)]
#![warn(clippy::single_range_in_vec_init)]
#![feature(generic_arg_infer)]

#[macro_use]
extern crate proc_macros;

macro_rules! a {
() => {
vec![0..200];
};
}

fn awa<T: PartialOrd>(start: T, end: T) {
[start..end];
}

fn awa_vec<T: PartialOrd>(start: T, end: T) {
vec![start..end];
}

fn main() {
// Lint
[0..200];
vec![0..200];
[0u8..200];
[0usize..200];
[0..200usize];
vec![0u8..200];
vec![0usize..200];
vec![0..200usize];
// Only suggest collect
[0..200isize];
vec![0..200isize];
// Do not lint
[0..200, 0..100];
vec![0..200, 0..100];
[0.0..200.0];
vec![0.0..200.0];
// `Copy` is not implemented for `Range`, so this doesn't matter
// [0..200; 2];
// [vec!0..200; 2];

// Unfortunately skips any macros
a!();

// Skip external macros and procedural macros
external! {
[0..200];
vec![0..200];
}
with_span! {
span
[0..200];
vec![0..200];
}
}
Loading