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 | |
| 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')
| -rw-r--r-- | crates/hir/src/code_model.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs index 5a1691eff..351ba75ff 100644 --- a/crates/hir/src/code_model.rs +++ b/crates/hir/src/code_model.rs | |||
| @@ -33,7 +33,7 @@ use hir_ty::{ | |||
| 33 | traits::{FnTrait, Solution, SolutionVariables}, | 33 | traits::{FnTrait, Solution, SolutionVariables}, |
| 34 | BoundVar, CallableDefId, CallableSig, Canonical, DebruijnIndex, GenericPredicate, | 34 | BoundVar, CallableDefId, CallableSig, Canonical, DebruijnIndex, GenericPredicate, |
| 35 | InEnvironment, Obligation, ProjectionPredicate, ProjectionTy, Scalar, Substs, TraitEnvironment, | 35 | InEnvironment, Obligation, ProjectionPredicate, ProjectionTy, Scalar, Substs, TraitEnvironment, |
| 36 | Ty, TyDefId, TyKind, | 36 | Ty, TyDefId, TyVariableKind, |
| 37 | }; | 37 | }; |
| 38 | use rustc_hash::FxHashSet; | 38 | use rustc_hash::FxHashSet; |
| 39 | use stdx::{format_to, impl_from}; | 39 | use stdx::{format_to, impl_from}; |
| @@ -1655,7 +1655,7 @@ impl Type { | |||
| 1655 | self.ty.environment.clone(), | 1655 | self.ty.environment.clone(), |
| 1656 | Obligation::Projection(predicate), | 1656 | Obligation::Projection(predicate), |
| 1657 | ), | 1657 | ), |
| 1658 | kinds: Arc::new([TyKind::General]), | 1658 | kinds: Arc::new([TyVariableKind::General]), |
| 1659 | }; | 1659 | }; |
| 1660 | 1660 | ||
| 1661 | match db.trait_solve(self.krate, goal)? { | 1661 | match db.trait_solve(self.krate, goal)? { |