fixup! New large_enum_variants linter

gnieto · gnieto · commit 088bb8fdb2f4 · 2016-08-23T20:12:23.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -193,7 +193,6 @@ All notable changes to this project will be documented in this file.
 [`empty_loop`]: https://github.com/Manishearth/rust-clippy/wiki#empty_loop
 [`enum_clike_unportable_variant`]: https://github.com/Manishearth/rust-clippy/wiki#enum_clike_unportable_variant
 [`enum_glob_use`]: https://github.com/Manishearth/rust-clippy/wiki#enum_glob_use
-[`enum_large_variant`]: https://github.com/Manishearth/rust-clippy/wiki#enum_large_variant
 [`enum_variant_names`]: https://github.com/Manishearth/rust-clippy/wiki#enum_variant_names
 [`eq_op`]: https://github.com/Manishearth/rust-clippy/wiki#eq_op
 [`eval_order_dependence`]: https://github.com/Manishearth/rust-clippy/wiki#eval_order_dependence
@@ -221,6 +220,7 @@ All notable changes to this project will be documented in this file.
 [`items_after_statements`]: https://github.com/Manishearth/rust-clippy/wiki#items_after_statements
 [`iter_next_loop`]: https://github.com/Manishearth/rust-clippy/wiki#iter_next_loop
 [`iter_nth`]: https://github.com/Manishearth/rust-clippy/wiki#iter_nth
+[`large_enum_variant`]: https://github.com/Manishearth/rust-clippy/wiki#large_enum_variant
 [`len_without_is_empty`]: https://github.com/Manishearth/rust-clippy/wiki#len_without_is_empty
 [`len_zero`]: https://github.com/Manishearth/rust-clippy/wiki#len_zero
 [`let_and_return`]: https://github.com/Manishearth/rust-clippy/wiki#let_and_return
diff --git a/README.md b/README.md
@@ -55,7 +55,6 @@ name
 [empty_loop](https://github.com/Manishearth/rust-clippy/wiki#empty_loop)                                             | warn    | empty `loop {}`, which should block or sleep
 [enum_clike_unportable_variant](https://github.com/Manishearth/rust-clippy/wiki#enum_clike_unportable_variant)       | warn    | C-like enums that are `repr(isize/usize)` and have values that don't fit into an `i32`
 [enum_glob_use](https://github.com/Manishearth/rust-clippy/wiki#enum_glob_use)                                       | allow   | use items that import all variants of an enum
-[enum_large_variant](https://github.com/Manishearth/rust-clippy/wiki#enum_large_variant)                             | warn    | large variants on an enum
 [enum_variant_names](https://github.com/Manishearth/rust-clippy/wiki#enum_variant_names)                             | warn    | enums where all variants share a prefix/postfix
 [eq_op](https://github.com/Manishearth/rust-clippy/wiki#eq_op)                                                       | warn    | equal operands on both sides of a comparison or bitwise combination (e.g. `x == x`)
 [eval_order_dependence](https://github.com/Manishearth/rust-clippy/wiki#eval_order_dependence)                       | warn    | whether a variable read occurs before a write depends on sub-expression evaluation order
@@ -83,6 +82,7 @@ name
 [items_after_statements](https://github.com/Manishearth/rust-clippy/wiki#items_after_statements)                     | allow   | blocks where an item comes after a statement
 [iter_next_loop](https://github.com/Manishearth/rust-clippy/wiki#iter_next_loop)                                     | warn    | for-looping over `_.next()` which is probably not intended
 [iter_nth](https://github.com/Manishearth/rust-clippy/wiki#iter_nth)                                                 | warn    | using `.iter().nth()` on a standard library type with O(1) element access
+[large_enum_variant](https://github.com/Manishearth/rust-clippy/wiki#large_enum_variant)                             | warn    | large variants on an enum
 [len_without_is_empty](https://github.com/Manishearth/rust-clippy/wiki#len_without_is_empty)                         | warn    | traits and impls that have `.len()` but not `.is_empty()`
 [len_zero](https://github.com/Manishearth/rust-clippy/wiki#len_zero)                                                 | warn    | checking `.len() == 0` or `.len() > 0` (or similar) when `.is_empty()` could be used instead
 [let_and_return](https://github.com/Manishearth/rust-clippy/wiki#let_and_return)                                     | warn    | creating a let-binding and then immediately returning it like `let x = expr; x` at the end of a block
diff --git a/clippy_lints/src/large_enum_variant.rs b/clippy_lints/src/large_enum_variant.rs
@@ -20,31 +20,31 @@ use rustc::ty::layout::TargetDataLayout;
 /// }
 /// ```
 declare_lint! {
-    pub ENUM_LARGE_VARIANT,
+    pub LARGE_ENUM_VARIANT,
     Warn,
     "large variants on an enum"
 }
 
 #[derive(Copy,Clone)]
-pub struct EnumLargeVariant {
+pub struct LargeEnumVariant {
     maximum_variant_size_allowed: u64,
 }
 
-impl EnumLargeVariant {
+impl LargeEnumVariant {
     pub fn new(maximum_variant_size_allowed: u64) -> Self {
-        EnumLargeVariant {
+        LargeEnumVariant {
             maximum_variant_size_allowed: maximum_variant_size_allowed,
         }
     }
 }
 
-impl LintPass for EnumLargeVariant {
+impl LintPass for LargeEnumVariant {
     fn get_lints(&self) -> LintArray {
-        lint_array!(ENUM_LARGE_VARIANT)
+        lint_array!(LARGE_ENUM_VARIANT)
     }
 }
 
-impl LateLintPass for EnumLargeVariant {
+impl LateLintPass for LargeEnumVariant {
     fn check_variant(&mut self, cx: &LateContext, variant: &Variant, _ :&Generics) {
         let data_layout = TargetDataLayout::parse(cx.sess());
         let param_env = cx.tcx.empty_parameter_environment();
@@ -61,7 +61,7 @@ impl LateLintPass for EnumLargeVariant {
         if variant_size > self.maximum_variant_size_allowed {
             span_help_and_lint(
                 cx,
-                ENUM_LARGE_VARIANT,
+                LARGE_ENUM_VARIANT,
                 variant.span,
                 &format!("large enum variant found on variant `{}`", variant.node.name),
                 "consider boxing the large branches to reduce the total size of the enum",
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
@@ -74,7 +74,6 @@ pub mod drop_ref;
 pub mod entry;
 pub mod enum_clike;
 pub mod enum_glob_use;
-pub mod enum_large_variant;
 pub mod enum_variants;
 pub mod eq_op;
 pub mod escape;
@@ -86,6 +85,7 @@ pub mod functions;
 pub mod identity_op;
 pub mod if_not_else;
 pub mod items_after_statements;
+pub mod large_enum_variant;
 pub mod len_zero;
 pub mod let_if_seq;
 pub mod lifetimes;
@@ -261,7 +261,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
     reg.register_late_lint_pass(box assign_ops::AssignOps);
     reg.register_late_lint_pass(box let_if_seq::LetIfSeq);
     reg.register_late_lint_pass(box eval_order_dependence::EvalOrderDependence);
-    reg.register_late_lint_pass(box enum_large_variant::EnumLargeVariant::new(conf.enum_variant_size_threshold));
+    reg.register_late_lint_pass(box large_enum_variant::LargeEnumVariant::new(conf.enum_variant_size_threshold));
 
     reg.register_lint_group("clippy_restrictions", vec![
         arithmetic::FLOAT_ARITHMETIC,
@@ -328,7 +328,6 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         drop_ref::DROP_REF,
         entry::MAP_ENTRY,
         enum_clike::ENUM_CLIKE_UNPORTABLE_VARIANT,
-        enum_large_variant::ENUM_LARGE_VARIANT,
         enum_variants::ENUM_VARIANT_NAMES,
         eq_op::EQ_OP,
         escape::BOXED_LOCAL,
@@ -340,6 +339,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         functions::NOT_UNSAFE_PTR_ARG_DEREF,
         functions::TOO_MANY_ARGUMENTS,
         identity_op::IDENTITY_OP,
+        large_enum_variant::LARGE_ENUM_VARIANT,
         len_zero::LEN_WITHOUT_IS_EMPTY,
         len_zero::LEN_ZERO,
         let_if_seq::USELESS_LET_IF_SEQ,
diff --git a/tests/compile-fail/large_enum_variant.rs b/tests/compile-fail/large_enum_variant.rs
@@ -3,7 +3,7 @@
 
 #![allow(dead_code)]
 #![allow(unused_variables)]
-#![deny(enum_large_variant)]
+#![deny(large_enum_variant)]
 
 enum LargeEnum {
     A(i32),
