From f91be08311c64cef8dcebd50b21bb53b92656c96 Mon Sep 17 00:00:00 2001
From: mu001999 <mu001999@outlook.com>
Date: Sun, 22 Feb 2026 23:16:58 +0800
Subject: [PATCH 1/3] Remove redundant self usages

---
 crates/base-db/src/lib.rs                                 | 2 +-
 crates/hir-expand/src/builtin/fn_macro.rs                 | 2 +-
 crates/hir-ty/src/lower.rs                                | 2 +-
 crates/ide-assists/src/handlers/promote_local_to_const.rs | 2 +-
 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;

From 5392fef0dfb55c28bab77e4034c392cb98d360e0 Mon Sep 17 00:00:00 2001
From: The rustc-josh-sync Cronjob Bot <github-actions@github.com>
Date: Mon, 2 Mar 2026 04:38:05 +0000
Subject: [PATCH 2/3] Prepare for merging from rust-lang/rust

This updates the rust-version file to e7d90c695a39426baf5ae705de2f9570a72229de.
---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index b6e1b2bc55..4dedd81b00 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-c78a29473a68f07012904af11c92ecffa68fcc75
+e7d90c695a39426baf5ae705de2f9570a72229de

From 1940931c34d00031b0ac9e0b3d4807a38c3fdf9f Mon Sep 17 00:00:00 2001
From: The rustc-josh-sync Cronjob Bot <github-actions@github.com>
Date: Mon, 2 Mar 2026 04:38:42 +0000
Subject: [PATCH 3/3] Format code

---
 crates/hir-expand/src/builtin/fn_macro.rs | 5 +----
 crates/hir-ty/src/lower.rs                | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/crates/hir-expand/src/builtin/fn_macro.rs b/crates/hir-expand/src/builtin/fn_macro.rs
index ae8eef2bbb..949b22b0ad 100644
--- a/crates/hir-expand/src/builtin/fn_macro.rs
+++ b/crates/hir-expand/src/builtin/fn_macro.rs
@@ -5,10 +5,7 @@ use std::borrow::Cow;
 use base_db::AnchoredPath;
 use cfg::CfgExpr;
 use either::Either;
-use intern::{
-    Symbol,
-    sym,
-};
+use intern::{Symbol, sym};
 use itertools::Itertools;
 use mbe::{DelimiterKind, expect_fragment};
 use span::{Edition, FileId, Span};
diff --git a/crates/hir-ty/src/lower.rs b/crates/hir-ty/src/lower.rs
index a0945c3bdc..895c2e7846 100644
--- a/crates/hir-ty/src/lower.rs
+++ b/crates/hir-ty/src/lower.rs
@@ -40,8 +40,7 @@ use rustc_hash::FxHashSet;
 use rustc_type_ir::{
     AliasTyKind, BoundVarIndexKind, ConstKind, DebruijnIndex, ExistentialPredicate,
     ExistentialProjection, ExistentialTraitRef, FnSig, Interner, OutlivesPredicate, TermKind,
-    TyKind,
-    TypeFoldable, TypeVisitableExt, Upcast, UpcastFrom, elaborate,
+    TyKind, TypeFoldable, TypeVisitableExt, Upcast, UpcastFrom, elaborate,
     inherent::{Clause as _, GenericArgs as _, IntoKind as _, Region as _, Ty as _},
 };
 use smallvec::SmallVec;