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 7149bf8f3e7bf5fb6bfc73413cf2828d2f4a747d..86c9edc821d7edfc22ece6aea004be93212f8587 100644 (file)
--- a/tests/ui/non_expressive_names.rs
+++ b/tests/ui/non_expressive_names.rs
@@ -1,8 +1,14 @@
-
-
-#![warn(clippy,similar_names)]
-#![allow(unused, println_empty_string)]
-
+// 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,
@@ -19,7 +25,6 @@ fn main() {
 
     let cpple: i32;
 
-
     let a_bar: i32;
     let b_bar: i32;
     let c_bar: i32;
@@ -44,7 +49,6 @@ fn main() {
     let blubx: i32;
     let bluby: i32;
 
-
     let cake: i32;
     let cakes: i32;
     let coke: i32;
@@ -71,7 +75,6 @@ fn main() {
     let parsed: i32;
     let parsee: i32;
 
-
     let setter: i32;
     let getter: i32;
     let tx1: i32;
@@ -82,8 +85,10 @@ fn main() {
 
 fn foo() {
     let Foo { apple, bpple } = unimplemented!();
-    let Foo { apple: spring,
-        bpple: sprang } = unimplemented!();
+    let Foo {
+        apple: spring,
+        bpple: sprang,
+    } = unimplemented!();
 }
 
 #[derive(Clone, Debug)]
@@ -122,7 +127,6 @@ fn bla() {
         {
             let e: i32;
             let f: i32;
-
         }
         match 5 {
             1 => println!(""),
@@ -139,12 +143,19 @@ 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;
+    let _1_ok = 1;
 }
 
 fn issue2927() {
-  let args = 1;
-  format!("{:?}", 2);
+    let args = 1;
+    format!("{:?}", 2);
+}
+
+fn issue3078() {
+    match "a" {
+        stringify!(a) => {},
+        _ => {},
+    }
 }
 
 struct Bar;
@@ -154,6 +165,26 @@ fn bar() {
         let _1 = 1;
         let ____1 = 1;
         let __1___2 = 12;
-        let _1_ok= 1;
+        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,
+}