diff options
| author | bors <bors@rust-lang.org> | 2025-05-24 14:20:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-24 14:20:44 +0000 |
| commit | 038d599eda4fe3e3d78103fba51ee663df86dadf (patch) | |
| tree | 86a65ec8aa8fe52db68793ad107c903371ff0454 /compiler/rustc_next_trait_solver/src/delegate.rs | |
| parent | 3de4f1ccf3873782fae2a3883d029ed3d4542581 (diff) | |
| parent | f84ffe29e1b05ce1bdc41b2298c9fcdeacea79f3 (diff) | |
| download | rust-038d599eda4fe3e3d78103fba51ee663df86dadf.tar.gz rust-038d599eda4fe3e3d78103fba51ee663df86dadf.zip | |
Auto merge of #141506 - matthiaskrgr:rollup-80f1geg, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #137323 (Guarantee behavior of transmuting `Option::<T>::None` subject to NPO) - #139254 (std: sys: net: uefi: Implement TCP4 connect) - #141432 (refactor `CanonicalVarKind`) - #141480 (document some -Z flags as living in the rustc-dev-guide) - #141486 (rustdoc book: add argument explanation for `html_playground_url`) - #141496 (Enable `[issue-links]` and `[no-mentions]` in triagebot) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_next_trait_solver/src/delegate.rs')
| -rw-r--r-- | compiler/rustc_next_trait_solver/src/delegate.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_next_trait_solver/src/delegate.rs b/compiler/rustc_next_trait_solver/src/delegate.rs index bb923612cff..32dc85b3e6a 100644 --- a/compiler/rustc_next_trait_solver/src/delegate.rs +++ b/compiler/rustc_next_trait_solver/src/delegate.rs @@ -61,7 +61,7 @@ pub trait SolverDelegate: Deref<Target = Self::Infcx> + Sized { fn instantiate_canonical_var_with_infer( &self, - cv_info: ty::CanonicalVarInfo<Self::Interner>, + kind: ty::CanonicalVarKind<Self::Interner>, span: <Self::Interner as Interner>::Span, universe_map: impl Fn(ty::UniverseIndex) -> ty::UniverseIndex, ) -> <Self::Interner as Interner>::GenericArg; |