Merge pull request #20268 from lnicola/sync-from-rust

lnicola · web-flow · commit 8b45a735510d · 2025-07-21T06:58:10.000Z
minor: Sync from downstream
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -89,11 +89,11 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
 edition = { path = "./crates/edition", version = "0.0.0" }
 
-ra-ap-rustc_lexer = { version = "0.121", default-features = false }
+ra-ap-rustc_lexer = { version = "0.122", default-features = false }
 ra-ap-rustc_parse_format = { version = "0.121", default-features = false }
-ra-ap-rustc_index = { version = "0.121", default-features = false }
-ra-ap-rustc_abi = { version = "0.121", default-features = false }
-ra-ap-rustc_pattern_analysis = { version = "0.121", default-features = false }
+ra-ap-rustc_index = { version = "0.122", default-features = false }
+ra-ap-rustc_abi = { version = "0.122", default-features = false }
+ra-ap-rustc_pattern_analysis = { version = "0.122", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
 
diff --git a/crates/test-utils/src/minicore.rs b/crates/test-utils/src/minicore.rs
@@ -1011,8 +1011,7 @@ pub mod ops {
     }
 
     #[lang = "add_assign"]
-    #[const_trait]
-    pub trait AddAssign<Rhs = Self> {
+    pub const trait AddAssign<Rhs = Self> {
         fn add_assign(&mut self, rhs: Rhs);
     }
 
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-a9fb6103b05c6ad6eee6bed4c0bb5a2e8e1024c6
+e05ab47e6c418fb2b9faa2eae9a7e70c65c98eaa

Original file line number	Diff line number	Diff line change
`@@ -1011,8 +1011,7 @@ pub mod ops {`
`1011`	`1011`	`}`
`1012`	`1012`
`1013`	`1013`	`#[lang = "add_assign"]`
`1014`		`- #[const_trait]`
`1015`		`- pub trait AddAssign<Rhs = Self> {`
	`1014`	`+ pub const trait AddAssign<Rhs = Self> {`
`1016`	`1015`	`fn add_assign(&mut self, rhs: Rhs);`
`1017`	`1016`	`}`
`1018`	`1017`