Merge branch 'master' into fix-3514

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

diff --git a/tests/ui/mem_forget.rs b/tests/ui/mem_forget.rs
index e553afcf05f6a8ad896edda7c87d1059eccb5395..b46f7007cd028db47e9818b013882aa906687a50 100644 (file)
--- a/tests/ui/mem_forget.rs
+++ b/tests/ui/mem_forget.rs
@@ -1,15 +1,20 @@
-#![feature(plugin)]
-#![plugin(clippy)]
+// 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.
 
-
-use std::sync::Arc;
 use std::rc::Rc;
+use std::sync::Arc;
 
-use std::mem::forget as forgetSomething;
 use std::mem as memstuff;
+use std::mem::forget as forgetSomething;
 
-#[deny(mem_forget)]
-#[allow(forget_copy)]
+#[warn(clippy::mem_forget)]
+#[allow(clippy::forget_copy)]
 fn main() {
     let five: i32 = 5;
     forgetSomething(five);
@@ -17,14 +22,11 @@ fn main() {
     let six: Arc<i32> = Arc::new(6);
     memstuff::forget(six);
 
-
     let seven: Rc<i32> = Rc::new(7);
     std::mem::forget(seven);
 
-
     let eight: Vec<i32> = vec![8];
     forgetSomething(eight);
 
-
     std::mem::forget(7);
 }