Auto merge of #68717 - petrochenkov:stabexpat, r=varkor

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

diff --git a/tests/ui/no_effect.rs b/tests/ui/no_effect.rs
index 4062b36883a0a18e093fa9d173678ec2a4209aeb..8fbfcb79860a58aa889b872a4c1b663bcf33ed64 100644 (file)
--- a/tests/ui/no_effect.rs
+++ b/tests/ui/no_effect.rs
@@ -1,16 +1,15 @@
-#![feature(plugin, box_syntax, inclusive_range_syntax)]
-#![plugin(clippy)]
-
-#![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 +20,7 @@ impl Drop for DropUnit {
     fn drop(&mut self) {}
 }
 struct DropStruct {
-    field: i32
+    field: i32,
 }
 impl Drop for DropStruct {
     fn drop(&mut self) {}
@@ -37,17 +36,27 @@ enum DropEnum {
 impl Drop for DropEnum {
     fn drop(&mut self) {}
 }
-
+struct FooString {
+    s: String,
+}
 union Union {
     a: u8,
     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
+}
 
 fn main() {
     let s = get_struct();
@@ -71,7 +80,7 @@ fn main() {
     5..;
     ..5;
     5..6;
-    5...6;
+    5..=6;
     [42, 55];
     [42, 55][1];
     (42, 55).1;
@@ -79,6 +88,8 @@ fn main() {
     [42; 55][13];
     let mut x = 0;
     || x += 5;
+    let s: String = "foo".into();
+    FooString { s: s };
 
     // Do not warn
     get_number();
@@ -88,32 +99,4 @@ 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()};
-
-    // 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() };
 }