Merge pull request #21419 from rust-lang/rustc-pull

lnicola · web-flow · commit 569d06df3517 · 2026-01-08T06:10:45.000Z
Rustc pull update
diff --git a/crates/hir-ty/src/lower.rs b/crates/hir-ty/src/lower.rs
@@ -861,7 +861,7 @@ impl<'db, 'a> TyLoweringContext<'db, 'a> {
                                 TermKind::Ty(ty) => {
                                     ty.walk().any(|arg| arg == dummy_self_ty.into())
                                 }
-                                // FIXME(associated_const_equality): We should walk the const instead of not doing anything
+                                // FIXME(mgca): We should walk the const instead of not doing anything
                                 TermKind::Const(_) => false,
                             };
 
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-e7d44143a12a526488e4f0c0d7ea8e62a4fe9354
+548e586795f6b6fe089d8329aa5edbf0f5202646

Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ impl<'db, 'a> TyLoweringContext<'db, 'a> {`
`861`	`861`	`TermKind::Ty(ty) => {`
`862`	`862`	`ty.walk().any(\|arg\| arg == dummy_self_ty.into())`
`863`	`863`	`}`
`864`		`- // FIXME(associated_const_equality): We should walk the const instead of not doing anything`
	`864`	`+ // FIXME(mgca): We should walk the const instead of not doing anything`
`865`	`865`	`TermKind::Const(_) => false,`
`866`	`866`	`};`
`867`	`867`