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 a56327eeefad811b24beb63edf0c9453b283dfb5..8fbfcb79860a58aa889b872a4c1b663bcf33ed64 100644 (file)
--- a/tests/ui/no_effect.rs
+++ b/tests/ui/no_effect.rs
@@ -1,19 +1,5 @@
-// 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.
-
-
-#![feature(tool_lints)]
-
 #![feature(box_syntax)]
-
-
-#![warn(clippy::no_effect, clippy::unnecessary_operation)]
+#![warn(clippy::no_effect)]
 #![allow(dead_code)]
 #![allow(path_statements)]
 #![allow(clippy::deref_addrof)]
@@ -23,7 +9,7 @@
 struct Unit;
 struct Tuple(i32);
 struct Struct {
-    field: i32
+    field: i32,
 }
 enum Enum {
     Tuple(i32),
@@ -34,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) {}
@@ -58,11 +44,19 @@ 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
+}
 
 fn main() {
     let s = get_struct();
@@ -105,33 +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()};
-    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() };
 }