Auto merge of #6336 - giraffate:sync-from-rust, r=flip1995

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

diff --git a/tests/ui/drop_forget_copy.rs b/tests/ui/drop_forget_copy.rs
index 8b2b96a14d3f6c4ecb6b990455929c8bce11a43d..9ddd6d64701a61dd615ec0b1d1f5d5451601617f 100644 (file)
--- a/tests/ui/drop_forget_copy.rs
+++ b/tests/ui/drop_forget_copy.rs
@@ -1,16 +1,3 @@
-// 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)]
-
-
 #![warn(clippy::drop_copy, clippy::forget_copy)]
 #![allow(clippy::toplevel_ref_arg, clippy::drop_ref, clippy::forget_ref, unused_mut)]
 
@@ -18,18 +5,21 @@
 use std::vec::Vec;
 
 #[derive(Copy, Clone)]
-struct SomeStruct {
-}
+struct SomeStruct {}
 
 struct AnotherStruct {
     x: u8,
     y: u8,
-    z: Vec<u8>
+    z: Vec<u8>,
 }
 
 impl Clone for AnotherStruct {
-    fn clone(& self) -> AnotherStruct {
-        AnotherStruct{x: self.x, y: self.y, z: self.z.clone()}
+    fn clone(&self) -> AnotherStruct {
+        AnotherStruct {
+            x: self.x,
+            y: self.y,
+            z: self.z.clone(),
+        }
     }
 }
 
@@ -52,7 +42,11 @@ fn main() {
     forget(s4);
     forget(s5);
 
-    let a1 = AnotherStruct {x: 255, y: 0, z: vec![1, 2, 3]};
+    let a1 = AnotherStruct {
+        x: 255,
+        y: 0,
+        z: vec![1, 2, 3],
+    };
     let a2 = &a1;
     let mut a3 = a1.clone();
     let ref a4 = a1;