Auto merge of #4478 - tsurai:master, r=flip1995

[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 301ff2761206a879433cda57b0f9f1cf8b9a052c..58415b4aede260b668dbd3db7a0f9a56bc56ecd8 100644 (file)
--- a/tests/ui/non_expressive_names.rs
+++ b/tests/ui/non_expressive_names.rs
@@ -23,71 +23,6 @@ fn fill(&mut self) {
     }
 }
 
-fn bla() {
-    let a: i32;
-    let (b, c, d): (i32, i64, i16);
-    {
-        {
-            let cdefg: i32;
-            let blar: i32;
-        }
-        {
-            let e: i32;
-        }
-        {
-            let e: i32;
-            let f: i32;
-        }
-        match 5 {
-            1 => println!(""),
-            e => panic!(),
-        }
-        match 5 {
-            1 => println!(""),
-            _ => panic!(),
-        }
-    }
-}
-
-fn bindings(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32, g: i32, h: i32) {}
-
-fn bindings2() {
-    let (a, b, c, d, e, f, g, h) = unimplemented!();
-}
-
-fn shadowing() {
-    let a = 0i32;
-    let a = 0i32;
-    let a = 0i32;
-    let a = 0i32;
-    let a = 0i32;
-    let a = 0i32;
-    {
-        let a = 0i32;
-    }
-}
-
-fn patterns() {
-    enum Z {
-        A(i32),
-        B(i32),
-        C(i32),
-        D(i32),
-        E(i32),
-        F(i32),
-    }
-
-    // These should not trigger a warning, since the pattern bindings are a new scope.
-    match Z::A(0) {
-        Z::A(a) => {},
-        Z::B(b) => {},
-        Z::C(c) => {},
-        Z::D(d) => {},
-        Z::E(e) => {},
-        Z::F(f) => {},
-    }
-}
-
 fn underscores_and_numbers() {
     let _1 = 1; //~ERROR Consider a more descriptive name
     let ____1 = 1; //~ERROR Consider a more descriptive name