Skip to content

Commit 61fc556

Browse files
ThibsGThibsG
committed
Add lint on large non scalar const
1 parent 8fd7e31 commit 61fc556

File tree

8 files changed

+250
-2
lines changed

8 files changed

+250
-2
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,6 +1366,7 @@ Released 2018-09-13
13661366
[`new_without_default`]: https://rust-lang.github.io/rust-clippy/master/index.html#new_without_default
13671367
[`no_effect`]: https://rust-lang.github.io/rust-clippy/master/index.html#no_effect
13681368
[`non_ascii_literal`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_ascii_literal
1369+
[`non_scalar_const`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_scalar_const
13691370
[`nonminimal_bool`]: https://rust-lang.github.io/rust-clippy/master/index.html#nonminimal_bool
13701371
[`nonsensical_open_options`]: https://rust-lang.github.io/rust-clippy/master/index.html#nonsensical_open_options
13711372
[`not_unsafe_ptr_arg_deref`]: https://rust-lang.github.io/rust-clippy/master/index.html#not_unsafe_ptr_arg_deref

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
77

8-
[There are 361 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
8+
[There are 362 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
99

1010
We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you:
1111

‎clippy_lints/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ pub mod new_without_default;
270270
pub mod no_effect;
271271
pub mod non_copy_const;
272272
pub mod non_expressive_names;
273+
pub mod non_scalar_const;
273274
pub mod open_options;
274275
pub mod option_env_unwrap;
275276
pub mod overflow_check_conditional;
@@ -722,6 +723,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
722723
&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS,
723724
&non_expressive_names::MANY_SINGLE_CHAR_NAMES,
724725
&non_expressive_names::SIMILAR_NAMES,
726+
&non_scalar_const::NON_SCALAR_CONST,
725727
&open_options::NONSENSICAL_OPEN_OPTIONS,
726728
&option_env_unwrap::OPTION_ENV_UNWRAP,
727729
&overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL,
@@ -1007,6 +1009,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
10071009
store.register_late_pass(|| box to_digit_is_some::ToDigitIsSome);
10081010
let array_size_threshold = conf.array_size_threshold;
10091011
store.register_late_pass(move || box large_stack_arrays::LargeStackArrays::new(array_size_threshold));
1012+
store.register_late_pass(move || box non_scalar_const::NonScalarConst::new(array_size_threshold));
10101013
store.register_late_pass(move || box floating_point_arithmetic::FloatingPointArithmetic);
10111014
store.register_early_pass(|| box as_conversions::AsConversions);
10121015
store.register_early_pass(|| box utils::internal_lints::ProduceIce);
@@ -1305,6 +1308,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
13051308
LintId::of(&non_copy_const::DECLARE_INTERIOR_MUTABLE_CONST),
13061309
LintId::of(&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS),
13071310
LintId::of(&non_expressive_names::MANY_SINGLE_CHAR_NAMES),
1311+
LintId::of(&non_scalar_const::NON_SCALAR_CONST),
13081312
LintId::of(&open_options::NONSENSICAL_OPEN_OPTIONS),
13091313
LintId::of(&option_env_unwrap::OPTION_ENV_UNWRAP),
13101314
LintId::of(&overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL),
@@ -1646,6 +1650,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
16461650
LintId::of(&methods::SINGLE_CHAR_PATTERN),
16471651
LintId::of(&misc::CMP_OWNED),
16481652
LintId::of(&mutex_atomic::MUTEX_ATOMIC),
1653+
LintId::of(&non_scalar_const::NON_SCALAR_CONST),
16491654
LintId::of(&redundant_clone::REDUNDANT_CLONE),
16501655
LintId::of(&slow_vector_initialization::SLOW_VECTOR_INITIALIZATION),
16511656
LintId::of(&trivially_copy_pass_by_ref::TRIVIALLY_COPY_PASS_BY_REF),

‎clippy_lints/src/non_scalar_const.rs

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
use crate::rustc_target::abi::LayoutOf;
2+
use crate::utils::span_lint_and_then;
3+
use if_chain::if_chain;
4+
use rustc::mir::interpret::ConstValue;
5+
use rustc::ty::{self, ConstKind};
6+
use rustc_errors::Applicability;
7+
use rustc_hir::{Item, ItemKind};
8+
use rustc_lint::{LateContext, LateLintPass};
9+
use rustc_session::{declare_tool_lint, impl_lint_pass};
10+
use rustc_span::{BytePos, Pos, Span};
11+
use rustc_typeck::hir_ty_to_ty;
12+
13+
declare_clippy_lint! {
14+
/// **What it does:** Checks for large `const` non-scalar types (ie: array) that should
15+
/// be defined as `static` instead.
16+
///
17+
/// **Why is this bad?** Performance: const variables are inlined upon use.
18+
/// Static items result in only one instance and has a fixed location in memory.
19+
///
20+
/// **Known problems:** None.
21+
///
22+
/// **Example:**
23+
/// ```rust,ignore
24+
/// // Bad
25+
/// pub const a = [0u32; 1_000_000];
26+
///
27+
/// // Good
28+
/// pub static a = [0u32; 1_000_000];
29+
/// ```
30+
pub NON_SCALAR_CONST,
31+
perf,
32+
"large non-scalar const variable may cause performance overhead"
33+
}
34+
35+
pub struct NonScalarConst {
36+
maximum_allowed_size: u64,
37+
}
38+
39+
impl NonScalarConst {
40+
#[must_use]
41+
pub fn new(maximum_allowed_size: u64) -> Self {
42+
Self { maximum_allowed_size }
43+
}
44+
}
45+
46+
impl_lint_pass!(NonScalarConst => [NON_SCALAR_CONST]);
47+
48+
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonScalarConst {
49+
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx Item<'_>) {
50+
if_chain! {
51+
if !item.span.from_expansion();
52+
if let ItemKind::Const(hir_ty, _) = &item.kind;
53+
let ty = hir_ty_to_ty(cx.tcx, hir_ty);
54+
if let ty::Array(element_type, cst) = ty.kind;
55+
if let ConstKind::Value(val) = cst.val;
56+
if let ConstValue::Scalar(element_count) = val;
57+
if let Ok(element_count) = element_count.to_machine_usize(&cx.tcx);
58+
if let Ok(element_size) = cx.layout_of(element_type).map(|l| l.size.bytes());
59+
if self.maximum_allowed_size < element_count * element_size;
60+
61+
then {
62+
let hi_pos = item.ident.span.lo() - BytePos::from_usize(1);
63+
let sugg_span = Span::new(
64+
hi_pos - BytePos::from_usize("const".len()),
65+
hi_pos,
66+
item.span.ctxt(),
67+
);
68+
span_lint_and_then(
69+
cx,
70+
NON_SCALAR_CONST,
71+
item.span,
72+
"large array defined as const",
73+
|db| {
74+
db.span_suggestion(
75+
sugg_span,
76+
"make this a static item",
77+
"static".to_string(),
78+
Applicability::MachineApplicable,
79+
);
80+
}
81+
);
82+
}
83+
}
84+
}
85+
}

‎src/lintlist/mod.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub use lint::Lint;
66
pub use lint::LINT_LEVELS;
77

88
// begin lint list, do not remove this comment, it’s used in `update_lints`
9-
pub const ALL_LINTS: [Lint; 361] = [
9+
pub const ALL_LINTS: [Lint; 362] = [
1010
Lint {
1111
name: "absurd_extreme_comparisons",
1212
group: "correctness",
@@ -1463,6 +1463,13 @@ pub const ALL_LINTS: [Lint; 361] = [
14631463
deprecation: None,
14641464
module: "unicode",
14651465
},
1466+
Lint {
1467+
name: "non_scalar_const",
1468+
group: "perf",
1469+
desc: "large non-scalar const variable may cause performance overhead",
1470+
deprecation: None,
1471+
module: "non_scalar_const",
1472+
},
14661473
Lint {
14671474
name: "nonminimal_bool",
14681475
group: "complexity",

‎tests/ui/non_scalar_const.fixed

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// run-rustfix
2+
3+
#![warn(clippy::non_scalar_const)]
4+
#![allow(dead_code)]
5+
6+
#[derive(Clone, Copy)]
7+
pub struct S {
8+
pub data: [u64; 32],
9+
}
10+
11+
// Should lint
12+
pub(crate) static FOO_PUB_CRATE: [u32; 1_000_000] = [0u32; 1_000_000];
13+
pub static FOO_PUB: [u32; 1_000_000] = [0u32; 1_000_000];
14+
static FOO: [u32; 1_000_000] = [0u32; 1_000_000];
15+
16+
// Good
17+
pub(crate) const G_FOO_PUB_CRATE: [u32; 1_000] = [0u32; 1_000];
18+
pub const G_FOO_PUB: [u32; 1_000] = [0u32; 1_000];
19+
const G_FOO: [u32; 1_000] = [0u32; 1_000];
20+
21+
fn main() {
22+
// Should lint
23+
pub static BAR_PUB: [u32; 1_000_000] = [0u32; 1_000_000];
24+
static BAR: [u32; 1_000_000] = [0u32; 1_000_000];
25+
pub static BAR_STRUCT_PUB: [S; 5_000] = [S { data: [0; 32] }; 5_000];
26+
static BAR_STRUCT: [S; 5_000] = [S { data: [0; 32] }; 5_000];
27+
pub static BAR_S_PUB: [Option<&str>; 200_000] = [Some("str"); 200_000];
28+
static BAR_S: [Option<&str>; 200_000] = [Some("str"); 200_000];
29+
30+
// Good
31+
pub const G_BAR_PUB: [u32; 1_000] = [0u32; 1_000];
32+
const G_BAR: [u32; 1_000] = [0u32; 1_000];
33+
pub const G_BAR_STRUCT_PUB: [S; 500] = [S { data: [0; 32] }; 500];
34+
const G_BAR_STRUCT: [S; 500] = [S { data: [0; 32] }; 500];
35+
pub const G_BAR_S_PUB: [Option<&str>; 200] = [Some("str"); 200];
36+
const G_BAR_S: [Option<&str>; 200] = [Some("str"); 200];
37+
}

‎tests/ui/non_scalar_const.rs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// run-rustfix
2+
3+
#![warn(clippy::non_scalar_const)]
4+
#![allow(dead_code)]
5+
6+
#[derive(Clone, Copy)]
7+
pub struct S {
8+
pub data: [u64; 32],
9+
}
10+
11+
// Should lint
12+
pub(crate) const FOO_PUB_CRATE: [u32; 1_000_000] = [0u32; 1_000_000];
13+
pub const FOO_PUB: [u32; 1_000_000] = [0u32; 1_000_000];
14+
const FOO: [u32; 1_000_000] = [0u32; 1_000_000];
15+
16+
// Good
17+
pub(crate) const G_FOO_PUB_CRATE: [u32; 1_000] = [0u32; 1_000];
18+
pub const G_FOO_PUB: [u32; 1_000] = [0u32; 1_000];
19+
const G_FOO: [u32; 1_000] = [0u32; 1_000];
20+
21+
fn main() {
22+
// Should lint
23+
pub const BAR_PUB: [u32; 1_000_000] = [0u32; 1_000_000];
24+
const BAR: [u32; 1_000_000] = [0u32; 1_000_000];
25+
pub const BAR_STRUCT_PUB: [S; 5_000] = [S { data: [0; 32] }; 5_000];
26+
const BAR_STRUCT: [S; 5_000] = [S { data: [0; 32] }; 5_000];
27+
pub const BAR_S_PUB: [Option<&str>; 200_000] = [Some("str"); 200_000];
28+
const BAR_S: [Option<&str>; 200_000] = [Some("str"); 200_000];
29+
30+
// Good
31+
pub const G_BAR_PUB: [u32; 1_000] = [0u32; 1_000];
32+
const G_BAR: [u32; 1_000] = [0u32; 1_000];
33+
pub const G_BAR_STRUCT_PUB: [S; 500] = [S { data: [0; 32] }; 500];
34+
const G_BAR_STRUCT: [S; 500] = [S { data: [0; 32] }; 500];
35+
pub const G_BAR_S_PUB: [Option<&str>; 200] = [Some("str"); 200];
36+
const G_BAR_S: [Option<&str>; 200] = [Some("str"); 200];
37+
}

‎tests/ui/non_scalar_const.stderr

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
error: large array defined as const
2+
--> $DIR/non_scalar_const.rs:12:1
3+
|
4+
LL | pub(crate) const FOO_PUB_CRATE: [u32; 1_000_000] = [0u32; 1_000_000];
5+
| ^^^^^^^^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
| |
7+
| help: make this a static item: `static`
8+
|
9+
= note: `-D clippy::non-scalar-const` implied by `-D warnings`
10+
11+
error: large array defined as const
12+
--> $DIR/non_scalar_const.rs:13:1
13+
|
14+
LL | pub const FOO_PUB: [u32; 1_000_000] = [0u32; 1_000_000];
15+
| ^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
16+
| |
17+
| help: make this a static item: `static`
18+
19+
error: large array defined as const
20+
--> $DIR/non_scalar_const.rs:14:1
21+
|
22+
LL | const FOO: [u32; 1_000_000] = [0u32; 1_000_000];
23+
| -----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
24+
| |
25+
| help: make this a static item: `static`
26+
27+
error: large array defined as const
28+
--> $DIR/non_scalar_const.rs:23:5
29+
|
30+
LL | pub const BAR_PUB: [u32; 1_000_000] = [0u32; 1_000_000];
31+
| ^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
32+
| |
33+
| help: make this a static item: `static`
34+
35+
error: large array defined as const
36+
--> $DIR/non_scalar_const.rs:24:5
37+
|
38+
LL | const BAR: [u32; 1_000_000] = [0u32; 1_000_000];
39+
| -----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
40+
| |
41+
| help: make this a static item: `static`
42+
43+
error: large array defined as const
44+
--> $DIR/non_scalar_const.rs:25:5
45+
|
46+
LL | pub const BAR_STRUCT_PUB: [S; 5_000] = [S { data: [0; 32] }; 5_000];
47+
| ^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
48+
| |
49+
| help: make this a static item: `static`
50+
51+
error: large array defined as const
52+
--> $DIR/non_scalar_const.rs:26:5
53+
|
54+
LL | const BAR_STRUCT: [S; 5_000] = [S { data: [0; 32] }; 5_000];
55+
| -----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
56+
| |
57+
| help: make this a static item: `static`
58+
59+
error: large array defined as const
60+
--> $DIR/non_scalar_const.rs:27:5
61+
|
62+
LL | pub const BAR_S_PUB: [Option<&str>; 200_000] = [Some("str"); 200_000];
63+
| ^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
64+
| |
65+
| help: make this a static item: `static`
66+
67+
error: large array defined as const
68+
--> $DIR/non_scalar_const.rs:28:5
69+
|
70+
LL | const BAR_S: [Option<&str>; 200_000] = [Some("str"); 200_000];
71+
| -----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
72+
| |
73+
| help: make this a static item: `static`
74+
75+
error: aborting due to 9 previous errors
76+

0 commit comments

Comments
 (0)