From cf6e2f53ba72888174224e30709c03128671252f Mon Sep 17 00:00:00 2001 From: boats Date: Tue, 20 Feb 2018 13:28:51 -0800 Subject: [PATCH 1/4] Add nonstandard_style alias for bad_style. --- src/librustc_lint/lib.rs | 6 ++ .../ui/lint/lint-group-nonstandard-style.rs | 36 ++++++++++ .../lint/lint-group-nonstandard-style.stderr | 67 +++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 src/test/ui/lint/lint-group-nonstandard-style.rs create mode 100644 src/test/ui/lint/lint-group-nonstandard-style.stderr diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs index 699765dde03ff..f3c6ff2f2b3a1 100644 --- a/src/librustc_lint/lib.rs +++ b/src/librustc_lint/lib.rs @@ -152,6 +152,12 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) { NON_SNAKE_CASE, NON_UPPER_CASE_GLOBALS); + add_lint_group!(sess, + "nonstandard_style", + NON_CAMEL_CASE_TYPES, + NON_SNAKE_CASE, + NON_UPPER_CASE_GLOBALS); + add_lint_group!(sess, "unused", UNUSED_IMPORTS, diff --git a/src/test/ui/lint/lint-group-nonstandard-style.rs b/src/test/ui/lint/lint-group-nonstandard-style.rs new file mode 100644 index 0000000000000..14fcf6d821a96 --- /dev/null +++ b/src/test/ui/lint/lint-group-nonstandard-style.rs @@ -0,0 +1,36 @@ +// Copyright 2014–2017 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![deny(nonstandard_style)] +#![allow(dead_code)] + +fn CamelCase() {} //~ ERROR should have a snake + +#[allow(bad_style)] +mod test { + fn CamelCase() {} + + #[forbid(bad_style)] + mod bad { + fn CamelCase() {} //~ ERROR should have a snake + + static bad: isize = 1; //~ ERROR should have an upper + } + + mod warn { + #![warn(bad_style)] + + fn CamelCase() {} //~ WARN should have a snake + + struct snake_case; //~ WARN should have a camel + } +} + +fn main() {} diff --git a/src/test/ui/lint/lint-group-nonstandard-style.stderr b/src/test/ui/lint/lint-group-nonstandard-style.stderr new file mode 100644 index 0000000000000..3466bee74061f --- /dev/null +++ b/src/test/ui/lint/lint-group-nonstandard-style.stderr @@ -0,0 +1,67 @@ +error: function `CamelCase` should have a snake case name such as `camel_case` + --> $DIR/lint-group-style.rs:14:1 + | +14 | fn CamelCase() {} //~ ERROR should have a snake + | ^^^^^^^^^^^^^^^^^ + | +note: lint level defined here + --> $DIR/lint-group-style.rs:11:9 + | +11 | #![deny(nonstandard_style)] + | ^^^^^^^^^ + = note: #[deny(non_snake_case)] implied by #[deny(nonstandard_style)] + +error: function `CamelCase` should have a snake case name such as `camel_case` + --> $DIR/lint-group-style.rs:22:9 + | +22 | fn CamelCase() {} //~ ERROR should have a snake + | ^^^^^^^^^^^^^^^^^ + | +note: lint level defined here + --> $DIR/lint-group-style.rs:20:14 + | +20 | #[forbid(nonstandard_style)] + | ^^^^^^^^^ + = note: #[forbid(non_snake_case)] implied by #[forbid(nonstandard_style)] + +error: static variable `bad` should have an upper case name such as `BAD` + --> $DIR/lint-group-style.rs:24:9 + | +24 | static bad: isize = 1; //~ ERROR should have an upper + | ^^^^^^^^^^^^^^^^^^^^^^ + | +note: lint level defined here + --> $DIR/lint-group-style.rs:20:14 + | +20 | #[forbid(nonstandard_style)] + | ^^^^^^^^^ + = note: #[forbid(non_upper_case_globals)] implied by #[forbid(nonstandard_style)] + +warning: function `CamelCase` should have a snake case name such as `camel_case` + --> $DIR/lint-group-style.rs:30:9 + | +30 | fn CamelCase() {} //~ WARN should have a snake + | ^^^^^^^^^^^^^^^^^ + | +note: lint level defined here + --> $DIR/lint-group-style.rs:28:17 + | +28 | #![warn(nonstandard_style)] + | ^^^^^^^^^ + = note: #[warn(non_snake_case)] implied by #[warn(nonstandard_style)] + +warning: type `snake_case` should have a camel case name such as `SnakeCase` + --> $DIR/lint-group-style.rs:32:9 + | +32 | struct snake_case; //~ WARN should have a camel + | ^^^^^^^^^^^^^^^^^^ + | +note: lint level defined here + --> $DIR/lint-group-style.rs:28:17 + | +28 | #![warn(nonstandard_style)] + | ^^^^^^^^^ + = note: #[warn(non_camel_case_types)] implied by #[warn(nonstandard_style)] + +error: aborting due to 3 previous errors + From 6fe5f42e373997c1f5bea2f002c6d6fbe8762c72 Mon Sep 17 00:00:00 2001 From: boats Date: Tue, 20 Feb 2018 13:38:46 -0800 Subject: [PATCH 2/4] Fix carets. --- src/test/ui/lint/lint-group-nonstandard-style.stderr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/ui/lint/lint-group-nonstandard-style.stderr b/src/test/ui/lint/lint-group-nonstandard-style.stderr index 3466bee74061f..1e055973bb2a6 100644 --- a/src/test/ui/lint/lint-group-nonstandard-style.stderr +++ b/src/test/ui/lint/lint-group-nonstandard-style.stderr @@ -8,7 +8,7 @@ note: lint level defined here --> $DIR/lint-group-style.rs:11:9 | 11 | #![deny(nonstandard_style)] - | ^^^^^^^^^ + | ^^^^^^^^^^^^^^^^^ = note: #[deny(non_snake_case)] implied by #[deny(nonstandard_style)] error: function `CamelCase` should have a snake case name such as `camel_case` @@ -21,7 +21,7 @@ note: lint level defined here --> $DIR/lint-group-style.rs:20:14 | 20 | #[forbid(nonstandard_style)] - | ^^^^^^^^^ + | ^^^^^^^^^^^^^^^^^ = note: #[forbid(non_snake_case)] implied by #[forbid(nonstandard_style)] error: static variable `bad` should have an upper case name such as `BAD` @@ -34,7 +34,7 @@ note: lint level defined here --> $DIR/lint-group-style.rs:20:14 | 20 | #[forbid(nonstandard_style)] - | ^^^^^^^^^ + | ^^^^^^^^^^^^^^^^^ = note: #[forbid(non_upper_case_globals)] implied by #[forbid(nonstandard_style)] warning: function `CamelCase` should have a snake case name such as `camel_case` @@ -47,7 +47,7 @@ note: lint level defined here --> $DIR/lint-group-style.rs:28:17 | 28 | #![warn(nonstandard_style)] - | ^^^^^^^^^ + | ^^^^^^^^^^^^^^^^^ = note: #[warn(non_snake_case)] implied by #[warn(nonstandard_style)] warning: type `snake_case` should have a camel case name such as `SnakeCase` @@ -60,7 +60,7 @@ note: lint level defined here --> $DIR/lint-group-style.rs:28:17 | 28 | #![warn(nonstandard_style)] - | ^^^^^^^^^ + | ^^^^^^^^^^^^^^^^^ = note: #[warn(non_camel_case_types)] implied by #[warn(nonstandard_style)] error: aborting due to 3 previous errors From 21e2a5e8d8bd09830a417b9801ff81b08b7c0c7e Mon Sep 17 00:00:00 2001 From: boats Date: Tue, 20 Feb 2018 14:44:39 -0800 Subject: [PATCH 3/4] Fix filepath in lint test. --- .../lint/lint-group-nonstandard-style.stderr | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/ui/lint/lint-group-nonstandard-style.stderr b/src/test/ui/lint/lint-group-nonstandard-style.stderr index 1e055973bb2a6..b0ce19e35eec7 100644 --- a/src/test/ui/lint/lint-group-nonstandard-style.stderr +++ b/src/test/ui/lint/lint-group-nonstandard-style.stderr @@ -1,63 +1,63 @@ error: function `CamelCase` should have a snake case name such as `camel_case` - --> $DIR/lint-group-style.rs:14:1 + --> $DIR/lint-group-nonstandard-style.rs:14:1 | 14 | fn CamelCase() {} //~ ERROR should have a snake | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:11:9 + --> $DIR/lint-group-nonstandard-style.rs:11:9 | 11 | #![deny(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ = note: #[deny(non_snake_case)] implied by #[deny(nonstandard_style)] error: function `CamelCase` should have a snake case name such as `camel_case` - --> $DIR/lint-group-style.rs:22:9 + --> $DIR/lint-group-nonstandard-style.rs:22:9 | 22 | fn CamelCase() {} //~ ERROR should have a snake | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:20:14 + --> $DIR/lint-group-nonstandard-style.rs:20:14 | 20 | #[forbid(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ = note: #[forbid(non_snake_case)] implied by #[forbid(nonstandard_style)] error: static variable `bad` should have an upper case name such as `BAD` - --> $DIR/lint-group-style.rs:24:9 + --> $DIR/lint-group-nonstandard-style.rs:24:9 | 24 | static bad: isize = 1; //~ ERROR should have an upper | ^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:20:14 + --> $DIR/lint-group-nonstandard-style.rs:20:14 | 20 | #[forbid(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ = note: #[forbid(non_upper_case_globals)] implied by #[forbid(nonstandard_style)] warning: function `CamelCase` should have a snake case name such as `camel_case` - --> $DIR/lint-group-style.rs:30:9 + --> $DIR/lint-group-nonstandard-style.rs:30:9 | 30 | fn CamelCase() {} //~ WARN should have a snake | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:28:17 + --> $DIR/lint-group-nonstandard-style.rs:28:17 | 28 | #![warn(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ = note: #[warn(non_snake_case)] implied by #[warn(nonstandard_style)] warning: type `snake_case` should have a camel case name such as `SnakeCase` - --> $DIR/lint-group-style.rs:32:9 + --> $DIR/lint-group-nonstandard-style.rs:32:9 | 32 | struct snake_case; //~ WARN should have a camel | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:28:17 + --> $DIR/lint-group-nonstandard-style.rs:28:17 | 28 | #![warn(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ From 5949d8b2d7b2bd01cfa454b029e7d921aedd7e27 Mon Sep 17 00:00:00 2001 From: boats Date: Tue, 20 Feb 2018 15:57:16 -0800 Subject: [PATCH 4/4] Fix internal references to bad_style in test code. --- src/test/ui/lint/lint-group-nonstandard-style.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/ui/lint/lint-group-nonstandard-style.rs b/src/test/ui/lint/lint-group-nonstandard-style.rs index 14fcf6d821a96..55d6168e6e008 100644 --- a/src/test/ui/lint/lint-group-nonstandard-style.rs +++ b/src/test/ui/lint/lint-group-nonstandard-style.rs @@ -13,11 +13,11 @@ fn CamelCase() {} //~ ERROR should have a snake -#[allow(bad_style)] +#[allow(nonstandard_style)] mod test { fn CamelCase() {} - #[forbid(bad_style)] + #[forbid(nonstandard_style)] mod bad { fn CamelCase() {} //~ ERROR should have a snake @@ -25,7 +25,7 @@ mod test { } mod warn { - #![warn(bad_style)] + #![warn(nonstandard_style)] fn CamelCase() {} //~ WARN should have a snake