Merge from rust-lang/rust

lnicola · lnicola · commit 99894ccbccd6 · 2025-07-21T09:18:22.000+03:00
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);
     }
 

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`