bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #5712 - ijijn:master, r=flip1995

Browse source 
Remove `bar` from blacklisted names

changelog: Remove `bar` from blacklisted names
fixes #5225
This commit is contained in:
Philipp Krones 2020-06-23 14:39:45 +02:00 • committed by GitHub
commit 0799be7156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 60 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
clippy_lints/src/utils/conf.rs
View file

@ -106,8 +106,8 @@ macro_rules! define_Conf {
pub use self::helpers::Conf; pub use self::helpers::Conf;
define_Conf! { define_Conf! {
/// Lint: BLACKLISTED_NAME. The list of blacklisted names to lint about /// Lint: BLACKLISTED_NAME. The list of blacklisted names to lint about. NB: `bar` is not here since it has legitimate uses
(blacklisted_names, "blacklisted_names": Vec<String>, ["foo", "bar", "baz", "quux"].iter().map(ToString::to_string).collect()), (blacklisted_names, "blacklisted_names": Vec<String>, ["foo", "baz", "quux"].iter().map(ToString::to_string).collect()),
/// Lint: COGNITIVE_COMPLEXITY. The maximum cognitive complexity a function can have /// Lint: COGNITIVE_COMPLEXITY. The maximum cognitive complexity a function can have
(cognitive_complexity_threshold, "cognitive_complexity_threshold": u64, 25), (cognitive_complexity_threshold, "cognitive_complexity_threshold": u64, 25),
/// DEPRECATED LINT: CYCLOMATIC_COMPLEXITY. Use the Cognitive Complexity lint instead. /// DEPRECATED LINT: CYCLOMATIC_COMPLEXITY. Use the Cognitive Complexity lint instead.

25
tests/ui/blacklisted_name.rs
View file

@ -12,29 +12,34 @@ fn test(foo: ()) {}
fn main() { fn main() {
let foo = 42; let foo = 42;
let bar = 42;
let baz = 42; let baz = 42;
let quux = 42;
// Unlike these others, `bar` is actually considered an acceptable name.
// Among many other legitimate uses, bar commonly refers to a period of time in music.
// See https://github.com/rust-lang/rust-clippy/issues/5225.
let bar = 42;
let barb = 42; let food = 42;
let barbaric = 42; let foodstuffs = 42;
let bazaar = 42;
match (42, Some(1337), Some(0)) { match (42, Some(1337), Some(0)) {
(foo, Some(bar), baz @ Some(_)) => (), (foo, Some(baz), quux @ Some(_)) => (),
_ => (), _ => (),
} }
} }
fn issue_1647(mut foo: u8) { fn issue_1647(mut foo: u8) {
let mut bar = 0; let mut baz = 0;
if let Some(mut baz) = Some(42) {} if let Some(mut quux) = Some(42) {}
} }
fn issue_1647_ref() { fn issue_1647_ref() {
let ref bar = 0; let ref baz = 0;
if let Some(ref baz) = Some(42) {} if let Some(ref quux) = Some(42) {}
} }
fn issue_1647_ref_mut() { fn issue_1647_ref_mut() {
let ref mut bar = 0; let ref mut baz = 0;
if let Some(ref mut baz) = Some(42) {} if let Some(ref mut quux) = Some(42) {}
} }

86
tests/ui/blacklisted_name.stderr
View file

@ -12,77 +12,77 @@ error: use of a blacklisted/placeholder name `foo`
LL | let foo = 42; LL | let foo = 42;
| ^^^ | ^^^
error: use of a blacklisted/placeholder name `bar`
--> $DIR/blacklisted_name.rs:15:9
|
LL | let bar = 42;
| ^^^
error: use of a blacklisted/placeholder name `baz` error: use of a blacklisted/placeholder name `baz`
--> $DIR/blacklisted_name.rs:16:9 --> $DIR/blacklisted_name.rs:15:9
| |
LL | let baz = 42; LL | let baz = 42;
| ^^^ | ^^^
error: use of a blacklisted/placeholder name `foo` error: use of a blacklisted/placeholder name `quux`
--> $DIR/blacklisted_name.rs:22:10 --> $DIR/blacklisted_name.rs:16:9
| |
LL | (foo, Some(bar), baz @ Some(_)) => (), LL | let quux = 42;
| ^^^^
error: use of a blacklisted/placeholder name `foo`
--> $DIR/blacklisted_name.rs:27:10
|
LL | (foo, Some(baz), quux @ Some(_)) => (),
| ^^^ | ^^^
error: use of a blacklisted/placeholder name `bar` error: use of a blacklisted/placeholder name `baz`
--> $DIR/blacklisted_name.rs:22:20 --> $DIR/blacklisted_name.rs:27:20
| |
LL | (foo, Some(bar), baz @ Some(_)) => (), LL | (foo, Some(baz), quux @ Some(_)) => (),
| ^^^ | ^^^
error: use of a blacklisted/placeholder name `baz` error: use of a blacklisted/placeholder name `quux`
--> $DIR/blacklisted_name.rs:22:26 --> $DIR/blacklisted_name.rs:27:26
| |
LL | (foo, Some(bar), baz @ Some(_)) => (), LL | (foo, Some(baz), quux @ Some(_)) => (),
| ^^^ | ^^^^
error: use of a blacklisted/placeholder name `foo` error: use of a blacklisted/placeholder name `foo`
--> $DIR/blacklisted_name.rs:27:19 --> $DIR/blacklisted_name.rs:32:19
| |
LL | fn issue_1647(mut foo: u8) { LL | fn issue_1647(mut foo: u8) {
| ^^^ | ^^^
error: use of a blacklisted/placeholder name `bar`
--> $DIR/blacklisted_name.rs:28:13
|
LL | let mut bar = 0;
| ^^^
error: use of a blacklisted/placeholder name `baz` error: use of a blacklisted/placeholder name `baz`
--> $DIR/blacklisted_name.rs:29:21
|
LL | if let Some(mut baz) = Some(42) {}
| ^^^
error: use of a blacklisted/placeholder name `bar`
--> $DIR/blacklisted_name.rs:33:13 --> $DIR/blacklisted_name.rs:33:13
| |
LL | let ref bar = 0; LL | let mut baz = 0;
| ^^^ | ^^^
error: use of a blacklisted/placeholder name `baz` error: use of a blacklisted/placeholder name `quux`
--> $DIR/blacklisted_name.rs:34:21 --> $DIR/blacklisted_name.rs:34:21
| |
LL | if let Some(ref baz) = Some(42) {} LL | if let Some(mut quux) = Some(42) {}
| ^^^ | ^^^^
error: use of a blacklisted/placeholder name `bar`
--> $DIR/blacklisted_name.rs:38:17
|
LL | let ref mut bar = 0;
| ^^^
error: use of a blacklisted/placeholder name `baz` error: use of a blacklisted/placeholder name `baz`
--> $DIR/blacklisted_name.rs:39:25 --> $DIR/blacklisted_name.rs:38:13
| |
LL | if let Some(ref mut baz) = Some(42) {} LL | let ref baz = 0;
| ^^^ | ^^^
error: use of a blacklisted/placeholder name `quux`
--> $DIR/blacklisted_name.rs:39:21
|
LL | if let Some(ref quux) = Some(42) {}
| ^^^^
error: use of a blacklisted/placeholder name `baz`
--> $DIR/blacklisted_name.rs:43:17
|
LL | let ref mut baz = 0;
| ^^^
error: use of a blacklisted/placeholder name `quux`
--> $DIR/blacklisted_name.rs:44:25
|
LL | if let Some(ref mut quux) = Some(42) {}
| ^^^^
error: aborting due to 14 previous errors error: aborting due to 14 previous errors