Merge ref 'e7d90c695a39' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: rust-lang/rust@e7d90c695a
Filtered ref: rust-lang/rust-analyzer@bf9b8b9d7c
Upstream diff: c78a29473a...e7d90c695a

This merge was created using https://github.com/rust-lang/josh-sync.

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};

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};

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 _},
 };

crates/ide-assists/src/handlers/promote_local_to_const.rs

@@ -8,7 +8,7 @@ use syntax::{
 
 use crate::{
     assist_context::{AssistContext, Assists},
-    utils::{self},
+    utils,
 };
 
 // Assist: promote_local_to_const

crates/rust-analyzer/src/tracing/config.rs

@@ -1,7 +1,7 @@
 //! Simple logger that logs either to stderr or to a file, using `tracing_subscriber`
 //! filter syntax and `tracing_appender` for non blocking output.
 
-use std::io::{self};
+use std::io;
 
 use anyhow::Context;
 use tracing::level_filters::LevelFilter;