Rollup merge of rust-lang#144808 - Veykril:push-uttkuyswqnzt, r=compiler-errors

samueltardieu · web-flow · commit f3297d8fd314 · 2025-08-03T21:56:58.000+02:00
`Interner` arg to `EarlyBinder` does not affect auto traits

Conceptually `EarlyBinder` does not contain an `Interner` so it shouldn't tell Rust it does via `PhantomData`. This is necessary for rust-analyzer as it stores `EarlyBinder`s in query results which require `Sync`, placing restrictions on our interner setup.

r? compiler-errors
diff --git a/compiler/rustc_type_ir/src/binder.rs b/compiler/rustc_type_ir/src/binder.rs
@@ -376,7 +376,7 @@ impl<I: Interner> TypeVisitor<I> for ValidateBoundVars<I> {
 pub struct EarlyBinder<I: Interner, T> {
     value: T,
     #[derive_where(skip(Debug))]
-    _tcx: PhantomData<I>,
+    _tcx: PhantomData<fn() -> I>,
 }
 
 /// For early binders, you should first call `instantiate` before using any visitors.

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ impl<I: Interner> TypeVisitor<I> for ValidateBoundVars<I> {`
`376`	`376`	`pub struct EarlyBinder<I: Interner, T> {`
`377`	`377`	`value: T,`
`378`	`378`	`#[derive_where(skip(Debug))]`
`379`		`- _tcx: PhantomData<I>,`
	`379`	`+ _tcx: PhantomData<fn() -> I>,`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	/// For early binders, you should first call `instantiate` before using any visitors.