From e3d849467ed1e6834b0fd6ade15f9e456588b599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nurzhan=20Sak=C3=A9n?= <nurzhan.sakenov@gmail.com>
Date: Mon, 4 Aug 2025 04:13:10 +0400
Subject: [PATCH 1/3] Remove strict_overflow_ops lint

---
 crates/ide-db/src/generated/lints.rs | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/crates/ide-db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs
index f9eb44d03a..14bc380586 100644
--- a/crates/ide-db/src/generated/lints.rs
+++ b/crates/ide-db/src/generated/lints.rs
@@ -10699,20 +10699,6 @@ The tracking issue for this feature is: [#77998]
 
 [#77998]: https://github.com/rust-lang/rust/issues/77998
 
-------------------------
-"##,
-        default_severity: Severity::Allow,
-        warn_since: None,
-        deny_since: None,
-    },
-    Lint {
-        label: "strict_overflow_ops",
-        description: r##"# `strict_overflow_ops`
-
-The tracking issue for this feature is: [#118260]
-
-[#118260]: https://github.com/rust-lang/rust/issues/118260
-
 ------------------------
 "##,
         default_severity: Severity::Allow,

From 302dc745642e332ded7c20fd842bb7c22f75311d Mon Sep 17 00:00:00 2001
From: Deadbeef <ent3rm4n@gmail.com>
Date: Sat, 9 Aug 2025 13:24:06 +0800
Subject: [PATCH 2/3] remove `P`

---
 crates/syntax-bridge/src/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/syntax-bridge/src/lib.rs b/crates/syntax-bridge/src/lib.rs
index bdff671802..4e525be3fe 100644
--- a/crates/syntax-bridge/src/lib.rs
+++ b/crates/syntax-bridge/src/lib.rs
@@ -127,11 +127,11 @@ where
 
 // The following items are what `rustc` macro can be parsed into :
 // link: https://github.com/rust-lang/rust/blob/9ebf47851a357faa4cd97f4b1dc7835f6376e639/src/libsyntax/ext/expand.rs#L141
-// * Expr(P<ast::Expr>)                     -> token_tree_to_expr
-// * Pat(P<ast::Pat>)                       -> token_tree_to_pat
-// * Ty(P<ast::Ty>)                         -> token_tree_to_ty
+// * Expr(Box<ast::Expr>)                     -> token_tree_to_expr
+// * Pat(Box<ast::Pat>)                       -> token_tree_to_pat
+// * Ty(Box<ast::Ty>)                         -> token_tree_to_ty
 // * Stmts(SmallVec<[ast::Stmt; 1]>)        -> token_tree_to_stmts
-// * Items(SmallVec<[P<ast::Item>; 1]>)     -> token_tree_to_items
+// * Items(SmallVec<[Box<ast::Item>; 1]>)     -> token_tree_to_items
 //
 // * TraitItems(SmallVec<[ast::TraitItem; 1]>)
 // * AssocItems(SmallVec<[ast::AssocItem; 1]>)

From 4446404782bee980b49122aff49573e25b801ead Mon Sep 17 00:00:00 2001
From: The rustc-josh-sync Cronjob Bot <github-actions@github.com>
Date: Mon, 11 Aug 2025 04:25:52 +0000
Subject: [PATCH 3/3] Prepare for merging from rust-lang/rust

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

diff --git a/rust-version b/rust-version
index 2178caf639..02b217f7d8 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-733dab558992d902d6d17576de1da768094e2cf3
+21a19c297d4f5a03501d92ca251bd7a17073c08a