Auto merge of #4478 - tsurai:master, r=flip1995

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

diff --git a/tests/ui/unsafe_removed_from_name.rs b/tests/ui/unsafe_removed_from_name.rs
index 39aa4afdf8d900bed994c2b2ea8fb45db9350702..a1f616733bd920a277f43afb1e9ce8bdfd865cc3 100644 (file)
--- a/tests/ui/unsafe_removed_from_name.rs
+++ b/tests/ui/unsafe_removed_from_name.rs
@@ -1,29 +1,17 @@
-// 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)]
-
 #![allow(unused_imports)]
 #![allow(dead_code)]
 #![warn(clippy::unsafe_removed_from_name)]
 
-use std::cell::{UnsafeCell as TotallySafeCell};
+use std::cell::UnsafeCell as TotallySafeCell;
 
 use std::cell::UnsafeCell as TotallySafeCellAgain;
 
 // Shouldn't error
-use std::cell::{UnsafeCell as SuperDangerousUnsafeCell};
-use std::cell::{UnsafeCell as Dangerunsafe};
-use std::cell::UnsafeCell as Bombsawayunsafe;
-use std::cell::{RefCell as ProbablyNotUnsafe};
+use std::cell::RefCell as ProbablyNotUnsafe;
 use std::cell::RefCell as RefCellThatCantBeUnsafe;
+use std::cell::UnsafeCell as SuperDangerousUnsafeCell;
+use std::cell::UnsafeCell as Dangerunsafe;
+use std::cell::UnsafeCell as Bombsawayunsafe;
 
 mod mod_with_some_unsafe_things {
     pub struct Safe {}