Auto merge of #3603 - xfix:random-state-lint, r=phansch

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

diff --git a/tests/ui/needless_return.rs b/tests/ui/needless_return.rs
index 442a0b925cbfbab1f47e7e6c27055adce731ba94..101be5946f4c1ad5eafc3b96e38595add3506b9e 100644 (file)
--- a/tests/ui/needless_return.rs
+++ b/tests/ui/needless_return.rs
@@ -1,7 +1,13 @@
-#![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.
 
-#![deny(needless_return)]
+#![warn(clippy::needless_return)]
 
 fn test_end_of_fn() -> bool {
     if true {
@@ -9,59 +15,34 @@ fn test_end_of_fn() -> bool {
         return true;
     }
     return true;
-    //~^ ERROR unneeded return statement
-    //~| HELP remove `return` as shown
-    //~| SUGGESTION true
 }
 
 fn test_no_semicolon() -> bool {
-    return true
-    //~^ ERROR unneeded return statement
-    //~| HELP remove `return` as shown
-    //~| SUGGESTION true
+    return true;
 }
 
 fn test_if_block() -> bool {
     if true {
         return true;
-        //~^ ERROR unneeded return statement
-        //~| HELP remove `return` as shown
-        //~| SUGGESTION true
     } else {
         return false;
-        //~^ ERROR unneeded return statement
-        //~| HELP remove `return` as shown
-        //~| SUGGESTION false
     }
 }
 
 fn test_match(x: bool) -> bool {
     match x {
         true => return false,
-        //~^ ERROR unneeded return statement
-        //~| HELP remove `return` as shown
-        //~| SUGGESTION false
-
         false => {
             return true;
-            //~^ ERROR unneeded return statement
-            //~| HELP remove `return` as shown
-            //~| SUGGESTION true
-        }
+        },
     }
 }
 
 fn test_closure() {
     let _ = || {
         return true;
-        //~^ ERROR unneeded return statement
-        //~| HELP remove `return` as shown
-        //~| SUGGESTION true
     };
     let _ = || return true;
-    //~^ ERROR unneeded return statement
-    //~| HELP remove `return` as shown
-    //~| SUGGESTION true
 }
 
 fn main() {