Rename "blacklisted name" to "disallowed name" throughout

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

diff --git a/tests/ui/let_if_seq.rs b/tests/ui/let_if_seq.rs
index 5fca759a4b3f30d112e3e4aae6524463cde14ec7..ee351880b80e447bfb48d525bd2d7ac5588379a2 100644 (file)
--- a/tests/ui/let_if_seq.rs
+++ b/tests/ui/let_if_seq.rs
@@ -1,21 +1,19 @@
-// 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_variables, unused_assignments, clippy::similar_names, clippy::blacklisted_name)]
+#![allow(
+    unused_variables,
+    unused_assignments,
+    clippy::similar_names,
+    clippy::disallowed_name,
+    clippy::branches_sharing_code,
+    clippy::needless_late_init
+)]
 #![warn(clippy::useless_let_if_seq)]
 
-fn f() -> bool { true }
-fn g(x: i32) -> i32 { x + 1 }
+fn f() -> bool {
+    true
+}
+fn g(x: i32) -> i32 {
+    x + 1
+}
 
 fn issue985() -> i32 {
     let mut x = 42;
@@ -37,6 +35,7 @@ fn issue985_alt() -> i32 {
     x
 }
 
+#[allow(clippy::manual_strip)]
 fn issue975() -> String {
     let mut udn = "dummy".to_string();
     if udn.starts_with("uuid:") {
@@ -73,8 +72,7 @@ fn main() {
     if f() {
         f();
         bar = 42;
-    }
-    else {
+    } else {
         f();
     }
 
@@ -113,4 +111,12 @@ fn main() {
     }
 
     baz = 1337;
+
+    // issue 3043 - types with interior mutability should not trigger this lint
+    use std::cell::Cell;
+    let mut val = Cell::new(1);
+    if true {
+        val = Cell::new(2);
+    }
+    println!("{}", val.get());
 }