Bless rest tests

Author: mu001999

src/tools/clippy/tests/ui/unnecessary_self_imports.fixed

@@ -1,5 +1,5 @@
 #![warn(clippy::unnecessary_self_imports)]
-#![allow(unused_imports, dead_code)]
+#![allow(unused_imports, dead_code, redundant_self)]
 
 use std::collections::hash_map::{self, *};
 use std::fs as alias;

src/tools/clippy/tests/ui/unnecessary_self_imports.rs

@@ -1,5 +1,5 @@
 #![warn(clippy::unnecessary_self_imports)]
-#![allow(unused_imports, dead_code)]
+#![allow(unused_imports, dead_code, redundant_self)]
 
 use std::collections::hash_map::{self, *};
 use std::fs::{self as alias};

tests/ui-fulldeps/internal-lints/non_glob_import_of_type_ir_inherent.rs

@@ -1,6 +1,7 @@
 //@ compile-flags: -Z unstable-options
 #![feature(rustc_private)]
 #![deny(rustc::non_glob_import_of_type_ir_inherent)]
+#![allow(redundant_self)]
 
 extern crate rustc_type_ir;
 

tests/ui-fulldeps/internal-lints/non_glob_import_of_type_ir_inherent.stderr

@@ -1,5 +1,5 @@
 error: non-glob import of `rustc_type_ir::inherent`
-  --> $DIR/non_glob_import_of_type_ir_inherent.rs:16:9
+  --> $DIR/non_glob_import_of_type_ir_inherent.rs:17:9
    |
 LL |     use rustc_type_ir::inherent::Predicate;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^---------
@@ -13,51 +13,51 @@ LL | #![deny(rustc::non_glob_import_of_type_ir_inherent)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: non-glob import of `rustc_type_ir::inherent`
-  --> $DIR/non_glob_import_of_type_ir_inherent.rs:17:35
+  --> $DIR/non_glob_import_of_type_ir_inherent.rs:18:35
    |
 LL |     use rustc_type_ir::inherent::{AdtDef, Ty};
    |                                   ^^^^^^ help: try using a glob import instead: `*`
 
 error: non-glob import of `rustc_type_ir::inherent`
-  --> $DIR/non_glob_import_of_type_ir_inherent.rs:17:43
+  --> $DIR/non_glob_import_of_type_ir_inherent.rs:18:43
    |
 LL |     use rustc_type_ir::inherent::{AdtDef, Ty};
    |                                           ^^ help: try using a glob import instead: `*`
 
 error: non-glob import of `rustc_type_ir::inherent`
-  --> $DIR/non_glob_import_of_type_ir_inherent.rs:20:9
+  --> $DIR/non_glob_import_of_type_ir_inherent.rs:21:9
    |
 LL |     use rustc_type_ir::inherent::ParamEnv as _;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^-------------
    |                                  |
    |                                  help: try using a glob import instead: `*`
 
 error: non-glob import of `rustc_type_ir::inherent`
-  --> $DIR/non_glob_import_of_type_ir_inherent.rs:24:9
+  --> $DIR/non_glob_import_of_type_ir_inherent.rs:25:9
    |
 LL |     use rustc_type_ir::inherent;
    |         ^^^^^^^^^^^^^^^^^^^^^^^- help: try using a glob import instead: `::*`
 
 error: non-glob import of `rustc_type_ir::inherent`
-  --> $DIR/non_glob_import_of_type_ir_inherent.rs:25:9
+  --> $DIR/non_glob_import_of_type_ir_inherent.rs:26:9
    |
 LL |     use rustc_type_ir::inherent as inh;
    |         ^^^^^^^^^^^^^^^^^^^^^^^------- help: try using a glob import instead: `::*`
 
 error: non-glob import of `rustc_type_ir::inherent`
-  --> $DIR/non_glob_import_of_type_ir_inherent.rs:26:25
+  --> $DIR/non_glob_import_of_type_ir_inherent.rs:27:25
    |
 LL |     use rustc_type_ir::{inherent as _};
    |                         ^^^^^^^^----- help: try using a glob import instead: `::*`
 
 error: non-glob import of `rustc_type_ir::inherent`
-  --> $DIR/non_glob_import_of_type_ir_inherent.rs:33:35
+  --> $DIR/non_glob_import_of_type_ir_inherent.rs:34:35
    |
 LL |     use rustc_type_ir::inherent::{self};
    |                                   ^^^^ help: try using a glob import instead: `*`
 
 error: non-glob import of `rustc_type_ir::inherent`
-  --> $DIR/non_glob_import_of_type_ir_inherent.rs:34:35
+  --> $DIR/non_glob_import_of_type_ir_inherent.rs:35:35
    |
 LL |     use rustc_type_ir::inherent::{self as innate};
    |                                   ^^^^----------

tests/ui/async-await/async-drop/ex-ice-132103.rs

@@ -5,6 +5,7 @@
 //@ edition: 2018
 #![feature(async_drop)]
 #![allow(incomplete_features)]
+#![allow(redundant_self)]
 
 use core::future::{async_drop_in_place, Future};
 use core::mem::{self};

tests/ui/delegation/target-expr-pass.rs

@@ -2,6 +2,7 @@
 
 #![feature(fn_delegation)]
 #![allow(incomplete_features)]
+#![allow(redundant_self)]
 
 mod to_reuse {
     pub fn foo(x: i32) -> i32 { x }

tests/ui/delegation/target-expr-pass.stderr

@@ -1,19 +1,19 @@
 warning: trait `Trait` is never used
-  --> $DIR/target-expr-pass.rs:17:7
+  --> $DIR/target-expr-pass.rs:18:7
    |
 LL | trait Trait {
    |       ^^^^^
    |
    = note: `#[warn(dead_code)]` (part of `#[warn(unused)]`) on by default
 
 warning: struct `F` is never constructed
-  --> $DIR/target-expr-pass.rs:21:8
+  --> $DIR/target-expr-pass.rs:22:8
    |
 LL | struct F;
    |        ^
 
 warning: struct `S` is never constructed
-  --> $DIR/target-expr-pass.rs:24:8
+  --> $DIR/target-expr-pass.rs:25:8
    |
 LL | struct S(F);
    |        ^

tests/ui/error-codes/E0429.rs

@@ -1,4 +1,6 @@
-use std::fmt::self; //~ ERROR E0429
+#![deny(redundant_self)]
+
+use std::fmt::self; //~ ERROR unnecessary `self`
 
 fn main () {
 }

tests/ui/error-codes/E0429.stderr

@@ -1,19 +1,16 @@
-error[E0429]: `self` imports are only allowed within a { } list
-  --> $DIR/E0429.rs:1:13
+error: unnecessary `self`
+  --> $DIR/E0429.rs:3:15
    |
 LL | use std::fmt::self;
-   |             ^^^^^^
+   |             --^^^^
+   |             |
+   |             help: consider removing this
    |
-help: consider importing the module directly
+note: the lint level is defined here
+  --> $DIR/E0429.rs:1:9
    |
-LL - use std::fmt::self;
-LL + use std::fmt;
-   |
-help: alternatively, use the multi-path `use` syntax to import `self`
-   |
-LL | use std::fmt::{self};
-   |               +    +
+LL | #![deny(redundant_self)]
+   |         ^^^^^^^^^^^^^^
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0429`.

tests/ui/imports/cycle-import-in-std-1.rs

@@ -2,6 +2,8 @@
 
 // https://github.com/rust-lang/rust/issues/124490
 
+#![allow(redundant_self)]
+
 use ops::{self as std};
 //~^ ERROR: unresolved import `ops`
 use std::collections::{self as ops};