diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-04 19:29:53 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-04-04 19:29:53 +0100 |
commit | 35614c762378f472ebefa12434b7e54a38a94eb9 (patch) | |
tree | 7230e16cd37c447be8576876789f7049d2b70495 /crates/hir_ty/src/infer/unify.rs | |
parent | 0924888cce5f48e0ea0dc7fd8641db92850ef660 (diff) | |
parent | 645a9c3a274109512839b79d8e86a805a39cd6e1 (diff) |
Merge #8328
8328: Move things in hir_ty into submodules r=flodiebold a=flodiebold
- all the types that will be replaced by Chalk go to `types`
- `TypeWalk` impls go to `walk`
- also fix signature of `Substitution::interned`
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/infer/unify.rs')
-rw-r--r-- | crates/hir_ty/src/infer/unify.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_ty/src/infer/unify.rs b/crates/hir_ty/src/infer/unify.rs index a04b935ef..b7bc48569 100644 --- a/crates/hir_ty/src/infer/unify.rs +++ b/crates/hir_ty/src/infer/unify.rs | |||
@@ -284,7 +284,7 @@ impl InferenceTable { | |||
284 | substs2: &Substitution, | 284 | substs2: &Substitution, |
285 | depth: usize, | 285 | depth: usize, |
286 | ) -> bool { | 286 | ) -> bool { |
287 | substs1.0.iter().zip(substs2.0.iter()).all(|(t1, t2)| { | 287 | substs1.iter(&Interner).zip(substs2.iter(&Interner)).all(|(t1, t2)| { |
288 | self.unify_inner(t1.assert_ty_ref(&Interner), t2.assert_ty_ref(&Interner), depth) | 288 | self.unify_inner(t1.assert_ty_ref(&Interner), t2.assert_ty_ref(&Interner), depth) |
289 | }) | 289 | }) |
290 | } | 290 | } |