Remove redundant self usages

compiler/rustc_attr_parsing/src/attributes/stability.rs

@@ -9,7 +9,7 @@ use rustc_hir::{
 
 use super::prelude::*;
 use super::util::parse_version;
-use crate::session_diagnostics::{self};
+use crate::session_diagnostics;
 
 macro_rules! reject_outside_std {
     ($cx: ident) => {

compiler/rustc_attr_parsing/src/session_diagnostics.rs

@@ -1,6 +1,6 @@
 use std::num::IntErrorKind;
 
-use rustc_ast::{self as ast};
+use rustc_ast as ast;
 use rustc_errors::codes::*;
 use rustc_errors::{
     Applicability, Diag, DiagArgValue, DiagCtxtHandle, Diagnostic, EmissionGuarantee, Level,

compiler/rustc_builtin_macros/src/cmdline_attrs.rs

@@ -1,6 +1,6 @@
 //! Attributes injected into the crate root from command line using `-Z crate-attr`.
 
-use rustc_ast::{self as ast};
+use rustc_ast as ast;
 use rustc_errors::Diag;
 use rustc_parse::parser::attr::InnerAttrPolicy;
 use rustc_parse::{parse_in, source_str_to_stream};

compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs

@@ -21,8 +21,8 @@ use crate::debuginfo::metadata::{
     size_and_align_of, type_di_node, unknown_file_metadata, visibility_di_flags,
 };
 use crate::debuginfo::utils::DIB;
+use crate::llvm;
 use crate::llvm::debuginfo::{DIFile, DIFlags, DIType};
-use crate::llvm::{self};
 
 // The names of the associated constants in each variant wrapper struct.
 // These have to match up with the names being used in `intrinsic.natvis`.

compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs

@@ -21,8 +21,8 @@ use crate::debuginfo::metadata::{
     file_metadata_from_def_id, type_di_node, unknown_file_metadata,
 };
 use crate::debuginfo::utils::{DIB, create_DIArray, get_namespace_for_item};
+use crate::llvm;
 use crate::llvm::debuginfo::{DIFlags, DIType};
-use crate::llvm::{self};
 
 mod cpp_like;
 mod native;

compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/native.rs

@@ -5,9 +5,8 @@ use rustc_abi::{Size, TagEncoding, VariantIdx, Variants};
 use rustc_codegen_ssa::debuginfo::type_names::compute_debuginfo_type_name;
 use rustc_codegen_ssa::debuginfo::{tag_base_type, wants_c_like_enum_debuginfo};
 use rustc_codegen_ssa::traits::{ConstCodegenMethods, MiscCodegenMethods};
-use rustc_middle::bug;
 use rustc_middle::ty::layout::{LayoutOf, TyAndLayout};
-use rustc_middle::ty::{self};
+use rustc_middle::{bug, ty};
 use smallvec::smallvec;
 
 use crate::common::{AsCCharPtr, CodegenCx};
@@ -18,8 +17,8 @@ use crate::debuginfo::metadata::{
     unknown_file_metadata, visibility_di_flags,
 };
 use crate::debuginfo::utils::{DIB, create_DIArray, get_namespace_for_item};
+use crate::llvm;
 use crate::llvm::debuginfo::{DIFile, DIFlags, DIType};
-use crate::llvm::{self};
 
 /// Build the debuginfo node for an enum type. The listing below shows how such a
 /// type looks like at the LLVM IR/DWARF level. It is a `DW_TAG_structure_type`

compiler/rustc_codegen_llvm/src/debuginfo/metadata/type_map.rs

@@ -12,8 +12,8 @@ use rustc_middle::ty::{self, ExistentialTraitRef, Ty, TyCtxt};
 use super::{DefinitionLocation, SmallVec, UNKNOWN_LINE_NUMBER, unknown_file_metadata};
 use crate::common::CodegenCx;
 use crate::debuginfo::utils::{DIB, create_DIArray, debug_context};
+use crate::llvm;
 use crate::llvm::debuginfo::{DIFlags, DIScope, DIType};
-use crate::llvm::{self};
 
 mod private {
     use rustc_macros::HashStable;

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -13,8 +13,8 @@ use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
 use rustc_codegen_ssa::mir::place::{PlaceRef, PlaceValue};
 use rustc_codegen_ssa::traits::*;
 use rustc_data_structures::assert_matches;
+use rustc_hir as hir;
 use rustc_hir::def_id::LOCAL_CRATE;
-use rustc_hir::{self as hir};
 use rustc_middle::mir::BinOp;
 use rustc_middle::ty::layout::{FnAbiOf, HasTyCtxt, HasTypingEnv, LayoutOf};
 use rustc_middle::ty::offload_meta::OffloadMetadata;

compiler/rustc_hir_typeck/src/fallback.rs

@@ -2,8 +2,8 @@ use std::cell::OnceCell;
 use std::ops::ControlFlow;
 
 use rustc_data_structures::fx::FxHashSet;
+use rustc_data_structures::graph;
 use rustc_data_structures::graph::vec_graph::VecGraph;
-use rustc_data_structures::graph::{self};
 use rustc_data_structures::unord::{UnordMap, UnordSet};
 use rustc_hir as hir;
 use rustc_hir::HirId;

compiler/rustc_lint/src/builtin.rs

@@ -44,9 +44,9 @@ use rustc_span::source_map::Spanned;
 use rustc_span::{DUMMY_SP, Ident, InnerSpan, Span, Symbol, kw, sym};
 use rustc_target::asm::InlineAsmArch;
 use rustc_trait_selection::infer::{InferCtxtExt, TyCtxtInferExt};
+use rustc_trait_selection::traits;
 use rustc_trait_selection::traits::misc::type_allowed_to_implement_copy;
 use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt as _;
-use rustc_trait_selection::traits::{self};
 
 use crate::errors::BuiltinEllipsisInclusiveRangePatterns;
 use crate::lints::{

compiler/rustc_lint/src/map_unit_fn.rs

@@ -1,5 +1,5 @@
 use rustc_hir::{Expr, ExprKind, Stmt, StmtKind};
-use rustc_middle::ty::{self};
+use rustc_middle::ty;
 use rustc_session::{declare_lint, declare_lint_pass};
 use rustc_span::sym;
 

compiler/rustc_lint/src/reference_casting.rs

@@ -1,7 +1,7 @@
 use rustc_ast::Mutability;
 use rustc_hir::{Expr, ExprKind, UnOp};
+use rustc_middle::ty;
 use rustc_middle::ty::layout::{LayoutOf as _, TyAndLayout};
-use rustc_middle::ty::{self};
 use rustc_session::{declare_lint, declare_lint_pass};
 use rustc_span::sym;
 

compiler/rustc_lint/src/transmute.rs

@@ -1,8 +1,8 @@
 use rustc_ast::LitKind;
 use rustc_errors::Applicability;
+use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::LocalDefId;
-use rustc_hir::{self as hir};
 use rustc_macros::Diagnostic;
 use rustc_middle::ty::{self, Ty};
 use rustc_session::{declare_lint, impl_lint_pass};

compiler/rustc_lint/src/unqualified_local_imports.rs

@@ -1,4 +1,4 @@
-use rustc_hir::{self as hir};
+use rustc_hir as hir;
 use rustc_session::{declare_lint, declare_lint_pass};
 use rustc_span::kw;
 

compiler/rustc_middle/src/ty/codec.rs

@@ -21,9 +21,8 @@ use crate::arena::ArenaAllocatable;
 use crate::infer::canonical::{CanonicalVarKind, CanonicalVarKinds};
 use crate::mir::interpret::{AllocId, ConstAllocation, CtfeProvenance};
 use crate::mir::mono::MonoItem;
-use crate::mir::{self};
-use crate::traits;
 use crate::ty::{self, AdtDef, GenericArgsRef, Ty, TyCtxt};
+use crate::{mir, traits};
 
 /// The shorthand encoding uses an enum's variant index `usize`
 /// and is offset by this value so it never matches a real variant.

compiler/rustc_middle/src/ty/context/impl_interner.rs

@@ -5,10 +5,10 @@ use std::fmt;
 use rustc_abi::ExternAbi;
 use rustc_data_structures::debug_assert_matches;
 use rustc_errors::ErrorGuaranteed;
+use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, CtorOf, DefKind};
 use rustc_hir::def_id::{DefId, LocalDefId};
 use rustc_hir::lang_items::LangItem;
-use rustc_hir::{self as hir};
 use rustc_span::{DUMMY_SP, Span, Symbol};
 use rustc_type_ir::lang_items::{SolverAdtLangItem, SolverLangItem, SolverTraitLangItem};
 use rustc_type_ir::{CollectAndApply, Interner, TypeFoldable, search_graph};

compiler/rustc_middle/src/ty/pattern.rs

@@ -3,9 +3,7 @@ use std::fmt;
 use rustc_data_structures::intern::Interned;
 use rustc_macros::HashStable;
 use rustc_type_ir::ir_print::IrPrint;
-use rustc_type_ir::{
-    FlagComputation, Flags, {self as ir},
-};
+use rustc_type_ir::{self as ir, FlagComputation, Flags};
 
 use super::TyCtxt;
 use crate::ty;

compiler/rustc_mir_build/src/builder/expr/as_constant.rs

@@ -1,7 +1,7 @@
 //! See docs in builder/expr/mod.rs
 
 use rustc_abi::Size;
-use rustc_ast::{self as ast};
+use rustc_ast as ast;
 use rustc_hir::LangItem;
 use rustc_middle::mir::interpret::{CTFE_ALLOC_SALT, Scalar};
 use rustc_middle::mir::*;

compiler/rustc_mir_transform/src/lint_tail_expr_drop_order.rs

@@ -23,8 +23,8 @@ use rustc_middle::ty::{self, TyCtxt};
 use rustc_mir_dataflow::impls::MaybeInitializedPlaces;
 use rustc_mir_dataflow::move_paths::{LookupResult, MoveData, MovePathIndex};
 use rustc_mir_dataflow::{Analysis, MaybeReachable, ResultsCursor};
+use rustc_session::lint;
 use rustc_session::lint::builtin::TAIL_EXPR_DROP_ORDER;
-use rustc_session::lint::{self};
 use rustc_span::{DUMMY_SP, Span, Symbol};
 use tracing::debug;
 

compiler/rustc_parse/src/parser/item.rs

@@ -2,11 +2,11 @@ use std::fmt::Write;
 use std::mem;
 
 use ast::token::IdentIsRaw;
+use rustc_ast as ast;
 use rustc_ast::ast::*;
 use rustc_ast::token::{self, Delimiter, InvisibleOrigin, MetaVarKind, TokenKind};
 use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree};
 use rustc_ast::util::case::Case;
-use rustc_ast::{self as ast};
 use rustc_ast_pretty::pprust;
 use rustc_errors::codes::*;
 use rustc_errors::{Applicability, PResult, StashKey, msg, struct_span_code_err};

compiler/rustc_resolve/src/lib.rs

@@ -25,7 +25,7 @@
 
 use std::cell::Ref;
 use std::collections::BTreeSet;
-use std::fmt::{self};
+use std::fmt;
 use std::ops::ControlFlow;
 use std::sync::Arc;
 

compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs

@@ -53,11 +53,11 @@ use std::{cmp, fmt, iter};
 use rustc_abi::ExternAbi;
 use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
 use rustc_errors::{Applicability, Diag, DiagStyledString, IntoDiagArg, StringPart, pluralize};
+use rustc_hir as hir;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::lang_items::LangItem;
-use rustc_hir::{self as hir};
 use rustc_infer::infer::DefineOpaqueTypes;
 use rustc_macros::extension;
 use rustc_middle::bug;

library/alloc/src/vec/drain.rs

@@ -1,8 +1,7 @@
-use core::fmt;
 use core::iter::{FusedIterator, TrustedLen};
 use core::mem::{self, ManuallyDrop, SizedTypeProperties};
 use core::ptr::{self, NonNull};
-use core::slice::{self};
+use core::{fmt, slice};
 
 use super::Vec;
 use crate::alloc::{Allocator, Global};

library/alloc/src/vec/into_iter.rs

@@ -9,8 +9,7 @@ use core::num::NonZero;
 use core::ops::Deref;
 use core::panic::UnwindSafe;
 use core::ptr::{self, NonNull};
-use core::slice::{self};
-use core::{array, fmt};
+use core::{array, fmt, slice};
 
 #[cfg(not(no_global_oom_handling))]
 use super::AsVecIntoIter;

library/alloc/src/vec/spec_extend.rs

@@ -1,6 +1,6 @@
 use core::clone::TrivialClone;
 use core::iter::TrustedLen;
-use core::slice::{self};
+use core::slice;
 
 use super::{IntoIter, Vec};
 use crate::alloc::Allocator;

library/alloc/src/vec/spec_from_iter.rs

@@ -1,5 +1,5 @@
 use core::mem::ManuallyDrop;
-use core::ptr::{self};
+use core::ptr;
 
 use super::{IntoIter, SpecExtend, SpecFromIterNested, Vec};
 

library/alloc/src/vec/splice.rs

@@ -1,5 +1,4 @@
-use core::ptr::{self};
-use core::slice::{self};
+use core::{ptr, slice};
 
 use super::{Drain, Vec};
 use crate::alloc::{Allocator, Global};

library/coretests/tests/cmp.rs

@@ -1,5 +1,5 @@
+use core::cmp;
 use core::cmp::Ordering::{self, *};
-use core::cmp::{self};
 
 #[test]
 fn test_int_totalord() {

library/coretests/tests/iter/adapters/array_chunks.rs

@@ -1,4 +1,4 @@
-use core::iter::{self};
+use core::iter;
 
 use super::*;
 

library/test/src/formatters/junit.rs

@@ -1,5 +1,5 @@
+use std::io;
 use std::io::prelude::Write;
-use std::io::{self};
 use std::time::Duration;
 
 use super::OutputFormatter;

library/test/src/term.rs

@@ -12,8 +12,8 @@
 
 #![deny(missing_docs)]
 
+use std::io;
 use std::io::prelude::*;
-use std::io::{self};
 
 pub(crate) use terminfo::TerminfoTerminal;
 #[cfg(windows)]

src/librustdoc/html/render/type_layout.rs

@@ -3,9 +3,8 @@ use std::fmt;
 use askama::Template;
 use rustc_abi::{Primitive, TagEncoding, Variants};
 use rustc_hir::def_id::DefId;
-use rustc_middle::span_bug;
 use rustc_middle::ty::layout::LayoutError;
-use rustc_middle::ty::{self};
+use rustc_middle::{span_bug, ty};
 use rustc_span::symbol::Symbol;
 
 use crate::html::render::Context;

src/librustdoc/scrape_examples.rs

@@ -5,8 +5,8 @@ use std::path::PathBuf;
 
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_errors::DiagCtxtHandle;
+use rustc_hir as hir;
 use rustc_hir::intravisit::{self, Visitor};
-use rustc_hir::{self as hir};
 use rustc_macros::{Decodable, Encodable};
 use rustc_middle::hir::nested_filter;
 use rustc_middle::ty::{self, TyCtxt};

src/tools/clippy/clippy_lints/src/methods/iter_out_of_bounds.rs

@@ -5,7 +5,7 @@ use clippy_utils::res::{MaybeDef, MaybeTypeckRes};
 use rustc_ast::LitKind;
 use rustc_hir::{Expr, ExprKind};
 use rustc_lint::LateContext;
-use rustc_middle::ty::{self};
+use rustc_middle::ty;
 
 use super::ITER_OUT_OF_BOUNDS;
 

src/tools/clippy/clippy_lints/src/methods/manual_contains.rs

@@ -8,7 +8,7 @@ use rustc_errors::Applicability;
 use rustc_hir::def::Res;
 use rustc_hir::{BinOpKind, Body, Expr, ExprKind, HirId, QPath};
 use rustc_lint::LateContext;
-use rustc_middle::ty::{self};
+use rustc_middle::ty;
 use rustc_span::source_map::Spanned;
 
 use super::MANUAL_CONTAINS;

src/tools/clippy/clippy_lints/src/types/linked_list.rs

@@ -1,7 +1,7 @@
 use clippy_utils::diagnostics::span_lint_and_help;
 use clippy_utils::sym;
 use rustc_hir::def_id::DefId;
-use rustc_hir::{self as hir};
+use rustc_hir as hir;
 use rustc_lint::LateContext;
 
 use super::LINKEDLIST;

src/tools/clippy/clippy_lints/src/types/owned_cow.rs

@@ -4,7 +4,7 @@ use clippy_utils::source::snippet_opt;
 use clippy_utils::sym;
 use rustc_errors::Applicability;
 use rustc_hir::def_id::DefId;
-use rustc_hir::{self as hir};
+use rustc_hir as hir;
 use rustc_lint::LateContext;
 use rustc_span::Span;
 

src/tools/lld-wrapper/src/main.rs

@@ -12,10 +12,9 @@
 //! On Windows it spawns a `..\rust-lld.exe` child process.
 
 use std::env::consts::EXE_SUFFIX;
-use std::env::{self};
 use std::fmt::Display;
 use std::path::{Path, PathBuf};
-use std::process;
+use std::{env, process};
 
 trait UnwrapOrExitWith<T> {
     fn unwrap_or_exit_with(self, context: &str) -> T;

src/tools/rust-analyzer/crates/base-db/src/lib.rs

@@ -32,7 +32,7 @@ pub use crate::{
     },
 };
 use dashmap::{DashMap, mapref::entry::Entry};
-pub use query_group::{self};
+pub use query_group;
 use rustc_hash::{FxHashSet, FxHasher};
 use salsa::{Durability, Setter};
 pub use semver::{BuildMetadata, Prerelease, Version, VersionReq};

src/tools/rust-analyzer/crates/hir-expand/src/builtin/fn_macro.rs

@@ -7,7 +7,7 @@ use cfg::CfgExpr;
 use either::Either;
 use intern::{
     Symbol,
-    sym::{self},
+    sym,
 };
 use itertools::Itertools;
 use mbe::{DelimiterKind, expect_fragment};

src/tools/rust-analyzer/crates/hir-ty/src/lower.rs

@@ -40,7 +40,7 @@ use rustc_hash::FxHashSet;
 use rustc_type_ir::{
     AliasTyKind, BoundVarIndexKind, ConstKind, DebruijnIndex, ExistentialPredicate,
     ExistentialProjection, ExistentialTraitRef, FnSig, Interner, OutlivesPredicate, TermKind,
-    TyKind::{self},
+    TyKind,
     TypeFoldable, TypeVisitableExt, Upcast, UpcastFrom, elaborate,
     inherent::{Clause as _, GenericArgs as _, IntoKind as _, Region as _, Ty as _},
 };