diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-01 12:57:26 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-01 12:57:26 +0000 |
| commit | cda13d54613006c7985da0489878605300ba05b8 (patch) | |
| tree | 81a8fc4b890192c41f00f7731929e781c3cb790a /crates/hir_ty/src/autoderef.rs | |
| parent | 1c7b2b8c0748c9548500d0dc08c8da1d1a36c81a (diff) | |
| parent | 4b7fc693150f333cefe0e69d93271807f32741c4 (diff) | |
Merge #7823
7823: Being Ty::InferenceVar closer to chalk equivalent r=flodiebold a=Veykril
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/autoderef.rs')
| -rw-r--r-- | crates/hir_ty/src/autoderef.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crates/hir_ty/src/autoderef.rs b/crates/hir_ty/src/autoderef.rs index ece68183e..21d1e5446 100644 --- a/crates/hir_ty/src/autoderef.rs +++ b/crates/hir_ty/src/autoderef.rs | |||
| @@ -89,8 +89,10 @@ fn deref_by_trait( | |||
| 89 | 89 | ||
| 90 | let in_env = InEnvironment { value: obligation, environment: ty.environment }; | 90 | let in_env = InEnvironment { value: obligation, environment: ty.environment }; |
| 91 | 91 | ||
| 92 | let canonical = | 92 | let canonical = Canonical::new( |
| 93 | Canonical::new(in_env, ty.value.kinds.iter().copied().chain(Some(super::TyKind::General))); | 93 | in_env, |
| 94 | ty.value.kinds.iter().copied().chain(Some(chalk_ir::TyVariableKind::General)), | ||
| 95 | ); | ||
| 94 | 96 | ||
| 95 | let solution = db.trait_solve(krate, canonical)?; | 97 | let solution = db.trait_solve(krate, canonical)?; |
| 96 | 98 | ||