-
Notifications
You must be signed in to change notification settings - Fork 1.7k
large_enum_variants lint suggests to box variants above a configurable limit #1492
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,98 @@ | ||
//! lint when there are large variants on an enum | ||
|
||
use rustc::lint::*; | ||
use rustc::hir::*; | ||
use utils::{span_lint_and_then, snippet_opt}; | ||
use rustc::ty::layout::TargetDataLayout; | ||
use rustc::ty::TypeFoldable; | ||
use rustc::traits::Reveal; | ||
|
||
/// **What it does:** Checks for large variants on `enum`s. | ||
/// | ||
/// **Why is this bad?** Enum size is bounded by the largest variant. Having a large variant | ||
/// can penalize the memory layout of that enum. | ||
/// | ||
/// **Known problems:** None. | ||
/// | ||
/// **Example:** | ||
/// ```rust | ||
/// enum Test { | ||
/// A(i32), | ||
/// B([i32; 8000]), | ||
/// } | ||
/// ``` | ||
declare_lint! { | ||
pub LARGE_ENUM_VARIANT, | ||
Warn, | ||
"large variants on an enum" | ||
} | ||
|
||
#[derive(Copy,Clone)] | ||
pub struct LargeEnumVariant { | ||
maximum_variant_size_allowed: u64, | ||
} | ||
|
||
impl LargeEnumVariant { | ||
pub fn new(maximum_variant_size_allowed: u64) -> Self { | ||
LargeEnumVariant { maximum_variant_size_allowed: maximum_variant_size_allowed } | ||
} | ||
} | ||
|
||
impl LintPass for LargeEnumVariant { | ||
fn get_lints(&self) -> LintArray { | ||
lint_array!(LARGE_ENUM_VARIANT) | ||
} | ||
} | ||
|
||
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LargeEnumVariant { | ||
fn check_item(&mut self, cx: &LateContext, item: &Item) { | ||
let did = cx.tcx.map.local_def_id(item.id); | ||
if let ItemEnum(ref def, _) = item.node { | ||
let ty = cx.tcx.item_type(did); | ||
let adt = ty.ty_adt_def().expect("already checked whether this is an enum"); | ||
for (i, variant) in adt.variants.iter().enumerate() { | ||
let data_layout = TargetDataLayout::parse(cx.sess()); | ||
cx.tcx.infer_ctxt((), Reveal::All).enter(|infcx| { | ||
let size: u64 = variant.fields | ||
.iter() | ||
.map(|f| { | ||
let ty = cx.tcx.item_type(f.did); | ||
if ty.needs_subst() { | ||
0 // we can't reason about generics, so we treat them as zero sized | ||
} else { | ||
ty.layout(&infcx) | ||
.expect("layout should be computable for concrete type") | ||
.size(&data_layout) | ||
.bytes() | ||
} | ||
}) | ||
.sum(); | ||
if size > self.maximum_variant_size_allowed { | ||
span_lint_and_then(cx, | ||
LARGE_ENUM_VARIANT, | ||
def.variants[i].span, | ||
"large enum variant found", | ||
|db| { | ||
if variant.fields.len() == 1 { | ||
let span = match def.variants[i].node.data { | ||
VariantData::Struct(ref fields, _) | | ||
VariantData::Tuple(ref fields, _) => fields[0].ty.span, | ||
VariantData::Unit(_) => unreachable!(), | ||
}; | ||
if let Some(snip) = snippet_opt(cx, span) { | ||
db.span_suggestion(span, | ||
"consider boxing the large fields to reduce the total size of \ | ||
the enum", | ||
format!("Box<{}>", snip)); | ||
return; | ||
} | ||
} | ||
db.span_help(def.variants[i].span, | ||
"consider boxing the large fields to reduce the total size of the enum"); | ||
}); | ||
} | ||
}); | ||
} | ||
} | ||
} | ||
} |
This file contains hidden or 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 hidden or 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 hidden or 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,53 @@ | ||
#![feature(plugin)] | ||
#![plugin(clippy)] | ||
|
||
#![allow(dead_code)] | ||
#![allow(unused_variables)] | ||
#![deny(large_enum_variant)] | ||
|
||
enum LargeEnum { | ||
A(i32), | ||
B([i32; 8000]), //~ ERROR large enum variant found | ||
//~^ HELP consider boxing the large fields to reduce the total size of the enum | ||
//~| SUGGESTION Box<[i32; 8000]> | ||
} | ||
|
||
enum GenericEnum<T> { | ||
A(i32), | ||
B([i32; 8000]), //~ ERROR large enum variant found | ||
//~^ HELP consider boxing the large fields to reduce the total size of the enum | ||
//~| SUGGESTION Box<[i32; 8000]> | ||
C([T; 8000]), | ||
D(T, [i32; 8000]), //~ ERROR large enum variant found | ||
//~^ HELP consider boxing the large fields to reduce the total size of the enum | ||
} | ||
|
||
trait SomeTrait { | ||
type Item; | ||
} | ||
|
||
enum LargeEnumGeneric<A: SomeTrait> { | ||
Var(A::Item), // regression test, this used to ICE | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You add regression tests even before the PR is merged? 😄 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I got tired of fixing multiple commits during rebasing and simply merged them into one |
||
} | ||
|
||
enum AnotherLargeEnum { | ||
VariantOk(i32, u32), | ||
ContainingLargeEnum(LargeEnum), //~ ERROR large enum variant found | ||
//~^ HELP consider boxing the large fields to reduce the total size of the enum | ||
//~| SUGGESTION Box<LargeEnum> | ||
ContainingMoreThanOneField(i32, [i32; 8000], [i32; 9500]), //~ ERROR large enum variant found | ||
//~^ HELP consider boxing the large fields to reduce the total size of the enum | ||
VoidVariant, | ||
StructLikeLittle { x: i32, y: i32 }, | ||
StructLikeLarge { x: [i32; 8000], y: i32 }, //~ ERROR large enum variant found | ||
//~^ HELP consider boxing the large fields to reduce the total size of the enum | ||
StructLikeLarge2 { //~ ERROR large enum variant found | ||
x: | ||
[i32; 8000] //~ SUGGESTION Box<[i32; 8000]> | ||
//~^ HELP consider boxing the large fields to reduce the total size of the enum | ||
}, | ||
} | ||
|
||
fn main() { | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, fortunately you did not promise 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in my defense, I only rebased this code ;)
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my defense, this does not appear in either the commit info (“@foo committed with @bar”), the first commit message, the blame info (you don't seem to have used
git rebase
?), or the PR's comment (“obsoletes #xyz” implies this is more than just a rebase).