Unnamed repository; edit this file 'description' to name the repository.
Merge ref 'e7d90c695a39' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@e7d90c695a39426baf5ae705de2f9570a72229de
Filtered ref: rust-lang/rust-analyzer@bf9b8b9d7ce8d2bf0063c4754ed00d8c9a1657c3
Upstream diff: https://github.com/rust-lang/rust/compare/c78a29473a68f07012904af11c92ecffa68fcc75...e7d90c695a39426baf5ae705de2f9570a72229de
This merge was created using https://github.com/rust-lang/josh-sync.
| -rw-r--r-- | crates/base-db/src/lib.rs | 2 | ||||
| -rw-r--r-- | crates/hir-expand/src/builtin/fn_macro.rs | 2 | ||||
| -rw-r--r-- | crates/hir-ty/src/lower.rs | 2 | ||||
| -rw-r--r-- | crates/ide-assists/src/handlers/promote_local_to_const.rs | 2 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/tracing/config.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/crates/base-db/src/lib.rs b/crates/base-db/src/lib.rs index 24f6dd59a9..5baf4ce6f9 100644 --- a/crates/base-db/src/lib.rs +++ b/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}; diff --git a/crates/hir-expand/src/builtin/fn_macro.rs b/crates/hir-expand/src/builtin/fn_macro.rs index 3029bca1d5..ae8eef2bbb 100644 --- a/crates/hir-expand/src/builtin/fn_macro.rs +++ b/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}; diff --git a/crates/hir-ty/src/lower.rs b/crates/hir-ty/src/lower.rs index 1290874177..a0945c3bdc 100644 --- a/crates/hir-ty/src/lower.rs +++ b/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 _}, }; diff --git a/crates/ide-assists/src/handlers/promote_local_to_const.rs b/crates/ide-assists/src/handlers/promote_local_to_const.rs index 547d3686e3..483c90d103 100644 --- a/crates/ide-assists/src/handlers/promote_local_to_const.rs +++ b/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 diff --git a/crates/rust-analyzer/src/tracing/config.rs b/crates/rust-analyzer/src/tracing/config.rs index ca897aeb3e..2bc9f3c34a 100644 --- a/crates/rust-analyzer/src/tracing/config.rs +++ b/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; |