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

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

diff --git a/tests/ui/no_effect.rs b/tests/ui/no_effect.rs
index a037ac3cf0e11cfe2d8c02654b97f5858aeba97f..8431f00e445c5eb37d3c1b17b57ffd4599c6c8c5 100644 (file)
--- a/tests/ui/no_effect.rs
+++ b/tests/ui/no_effect.rs
@@ -1,16 +1,24 @@
-#![feature(plugin, box_syntax, inclusive_range_syntax)]
+// 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(no_effect, unnecessary_operation)]
+#![feature(box_syntax)]
+#![warn(clippy::no_effect)]
 #![allow(dead_code)]
 #![allow(path_statements)]
-#![allow(deref_addrof)]
+#![allow(clippy::deref_addrof)]
+#![allow(clippy::redundant_field_names)]
 #![feature(untagged_unions)]
 
 struct Unit;
 struct Tuple(i32);
 struct Struct {
-    field: i32
+    field: i32,
 }
 enum Enum {
     Tuple(i32),
@@ -21,7 +29,7 @@ impl Drop for DropUnit {
     fn drop(&mut self) {}
 }
 struct DropStruct {
-    field: i32
+    field: i32,
 }
 impl Drop for DropStruct {
     fn drop(&mut self) {}
@@ -45,11 +53,34 @@ union Union {
     b: f64,
 }
 
-fn get_number() -> i32 { 0 }
-fn get_struct() -> Struct { Struct { field: 0 } }
-fn get_drop_struct() -> DropStruct { DropStruct { field: 0 } }
+fn get_number() -> i32 {
+    0
+}
+fn get_struct() -> Struct {
+    Struct { field: 0 }
+}
+fn get_drop_struct() -> DropStruct {
+    DropStruct { field: 0 }
+}
+
+unsafe fn unsafe_fn() -> i32 {
+    0
+}
 
-unsafe fn unsafe_fn() -> i32 { 0 }
+struct A(i32);
+struct B {
+    field: i32,
+}
+struct C {
+    b: B,
+}
+struct D {
+    arr: [i32; 1],
+}
+const A_CONST: A = A(1);
+const B: B = B { field: 1 };
+const C: C = C { b: B { field: 1 } };
+const D: D = D { arr: [1] };
 
 fn main() {
     let s = get_struct();
@@ -83,6 +114,10 @@ fn main() {
     || x += 5;
     let s: String = "foo".into();
     FooString { s: s };
+    A_CONST.0 = 2;
+    B.field = 2;
+    C.b.field = 2;
+    D.arr[0] = 2;
 
     // Do not warn
     get_number();
@@ -92,33 +127,12 @@ fn main() {
     DropTuple(0);
     DropEnum::Tuple(0);
     DropEnum::Struct { field: 0 };
-
-    Tuple(get_number());
-    Struct { field: get_number() };
-    Struct { ..get_struct() };
-    Enum::Tuple(get_number());
-    Enum::Struct { field: get_number() };
-    5 + get_number();
-    *&get_number();
-    &get_number();
-    (5, 6, get_number());
-    box get_number();
-    get_number()..;
-    ..get_number();
-    5..get_number();
-    [42, get_number()];
-    [42, 55][get_number() as usize];
-    (42, get_number()).1;
-    [get_number(); 55];
-    [42; 55][get_number() as usize];
-    {get_number()};
-    FooString { s: String::from("blah"), };
-
-    // Do not warn
-    DropTuple(get_number());
-    DropStruct { field: get_number() };
-    DropStruct { field: get_number() };
-    DropStruct { ..get_drop_struct() };
-    DropEnum::Tuple(get_number());
-    DropEnum::Struct { field: get_number() };
+    let mut a_mut = A(1);
+    a_mut.0 = 2;
+    let mut b_mut = B { field: 1 };
+    b_mut.field = 2;
+    let mut c_mut = C { b: B { field: 1 } };
+    c_mut.b.field = 2;
+    let mut d_mut = D { arr: [1] };
+    d_mut.arr[0] = 2;
 }