Auto merge of #3603 - xfix:random-state-lint, r=phansch

[rust.git] / tests / ui / non_expressive_names.rs

diff --git a/tests/ui/non_expressive_names.rs b/tests/ui/non_expressive_names.rs
index 778041f49b8c63a1b4cd2be785e1bb7947989e1e..86c9edc821d7edfc22ece6aea004be93212f8587 100644 (file)
--- a/tests/ui/non_expressive_names.rs
+++ b/tests/ui/non_expressive_names.rs
@@ -1,19 +1,14 @@
-#![feature(plugin)]
-#![plugin(clippy)]
-#![deny(clippy,similar_names)]
-//~^ NOTE: lint level defined here
-//~| NOTE: lint level defined here
-//~| NOTE: lint level defined here
-//~| NOTE: lint level defined here
-//~| NOTE: lint level defined here
-//~| NOTE: lint level defined here
-//~| NOTE: lint level defined here
-//~| NOTE: lint level defined here
-//~| NOTE: lint level defined here
-//~| NOTE: lint level defined here
-//~| NOTE: lint level defined here
-#![allow(unused)]
-
+// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![warn(clippy::all, clippy::similar_names)]
+#![allow(unused, clippy::println_empty_string)]
 
 struct Foo {
     apple: i32,
@@ -24,12 +19,11 @@ fn main() {
     let specter: i32;
     let spectre: i32;
 
-    let apple: i32; //~ NOTE: existing binding defined here
-    //~^ NOTE: existing binding defined here
-    let bpple: i32; //~ ERROR: name is too similar
-    //~| HELP: separate the discriminating character by an underscore like: `b_pple`
-    let cpple: i32; //~ ERROR: name is too similar
-    //~| HELP: separate the discriminating character by an underscore like: `c_pple`
+    let apple: i32;
+
+    let bpple: i32;
+
+    let cpple: i32;
 
     let a_bar: i32;
     let b_bar: i32;
@@ -52,13 +46,12 @@ fn main() {
     let blubrhs: i32;
     let blublhs: i32;
 
-    let blubx: i32; //~ NOTE: existing binding defined here
-    let bluby: i32; //~ ERROR: name is too similar
-    //~| HELP: separate the discriminating character by an underscore like: `blub_y`
+    let blubx: i32;
+    let bluby: i32;
 
-    let cake: i32; //~ NOTE: existing binding defined here
+    let cake: i32;
     let cakes: i32;
-    let coke: i32; //~ ERROR: name is too similar
+    let coke: i32;
 
     match 5 {
         cheese @ 1 => {},
@@ -74,14 +67,13 @@ fn main() {
     let ipv6: i32;
     let abcd1: i32;
     let abdc2: i32;
-    let xyz1abc: i32; //~ NOTE: existing binding defined here
+    let xyz1abc: i32;
     let xyz2abc: i32;
-    let xyzeabc: i32; //~ ERROR: name is too similar
+    let xyzeabc: i32;
 
-    let parser: i32; //~ NOTE: existing binding defined here
+    let parser: i32;
     let parsed: i32;
-    let parsee: i32; //~ ERROR: name is too similar
-    //~| HELP: separate the discriminating character by an underscore like: `parse_e`
+    let parsee: i32;
 
     let setter: i32;
     let getter: i32;
@@ -93,8 +85,10 @@ fn main() {
 
 fn foo() {
     let Foo { apple, bpple } = unimplemented!();
-    let Foo { apple: spring, //~NOTE existing binding defined here
-        bpple: sprang } = unimplemented!(); //~ ERROR: name is too similar
+    let Foo {
+        apple: spring,
+        bpple: sprang,
+    } = unimplemented!();
 }
 
 #[derive(Clone, Debug)]
@@ -128,19 +122,15 @@ fn bla() {
             let blar: i32;
         }
         {
-            let e: i32; //~ ERROR: 5th binding whose name is just one char
-            //~^ NOTE implied by
+            let e: i32;
         }
         {
-            let e: i32; //~ ERROR: 5th binding whose name is just one char
-            //~^ NOTE implied by
-            let f: i32; //~ ERROR: 6th binding whose name is just one char
-            //~^ NOTE implied by
+            let e: i32;
+            let f: i32;
         }
         match 5 {
             1 => println!(""),
-            e => panic!(), //~ ERROR: 5th binding whose name is just one char
-            //~^ NOTE implied by
+            e => panic!(),
         }
         match 5 {
             1 => println!(""),
@@ -148,3 +138,53 @@ fn bla() {
         }
     }
 }
+
+fn underscores_and_numbers() {
+    let _1 = 1; //~ERROR Consider a more descriptive name
+    let ____1 = 1; //~ERROR Consider a more descriptive name
+    let __1___2 = 12; //~ERROR Consider a more descriptive name
+    let _1_ok = 1;
+}
+
+fn issue2927() {
+    let args = 1;
+    format!("{:?}", 2);
+}
+
+fn issue3078() {
+    match "a" {
+        stringify!(a) => {},
+        _ => {},
+    }
+}
+
+struct Bar;
+
+impl Bar {
+    fn bar() {
+        let _1 = 1;
+        let ____1 = 1;
+        let __1___2 = 12;
+        let _1_ok = 1;
+    }
+}
+
+// false positive similar_names (#3057, #2651)
+// clippy claimed total_reg_src_size and total_size and
+// numb_reg_src_checkouts and total_bin_size were similar
+#[derive(Debug, Clone)]
+pub(crate) struct DirSizes {
+    pub(crate) total_size: u64,
+    pub(crate) numb_bins: u64,
+    pub(crate) total_bin_size: u64,
+    pub(crate) total_reg_size: u64,
+    pub(crate) total_git_db_size: u64,
+    pub(crate) total_git_repos_bare_size: u64,
+    pub(crate) numb_git_repos_bare_repos: u64,
+    pub(crate) numb_git_checkouts: u64,
+    pub(crate) total_git_chk_size: u64,
+    pub(crate) total_reg_cache_size: u64,
+    pub(crate) total_reg_src_size: u64,
+    pub(crate) numb_reg_cache_entries: u64,
+    pub(crate) numb_reg_src_checkouts: u64,
+}