aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorFlorian Diebold <[email protected]>2021-05-15 19:18:54 +0100
committerFlorian Diebold <[email protected]>2021-05-21 16:48:34 +0100
commit48c492af7ec8ff6af4fe2b38f83aa007c9f7f0b8 (patch)
treef534549b8dc12c89c93cf373b46f1e01563c279b /crates
parentb939a6dcacc0460f49781e922c979d235a52eeca (diff)
Fix compilation of hir and ide crates
Diffstat (limited to 'crates')
-rw-r--r--crates/hir/src/lib.rs4
-rw-r--r--crates/ide_completion/src/render.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index d443b124c..21b1a8e4a 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -2223,8 +2223,8 @@ impl Type {
2223 walk_type(db, self, &mut cb); 2223 walk_type(db, self, &mut cb);
2224 } 2224 }
2225 2225
2226 pub fn could_unify_with(&self, other: &Type) -> bool { 2226 pub fn could_unify_with(&self, db: &dyn HirDatabase, other: &Type) -> bool {
2227 could_unify(&self.ty, &other.ty) 2227 could_unify(db, self.env.clone(), &self.ty, &other.ty)
2228 } 2228 }
2229} 2229}
2230 2230
diff --git a/crates/ide_completion/src/render.rs b/crates/ide_completion/src/render.rs
index 1a762d3dc..6b04ee164 100644
--- a/crates/ide_completion/src/render.rs
+++ b/crates/ide_completion/src/render.rs
@@ -323,7 +323,7 @@ fn compute_type_match(
323 323
324 if completion_ty == expected_type { 324 if completion_ty == expected_type {
325 Some(CompletionRelevanceTypeMatch::Exact) 325 Some(CompletionRelevanceTypeMatch::Exact)
326 } else if expected_type.could_unify_with(completion_ty) { 326 } else if expected_type.could_unify_with(ctx.db, completion_ty) {
327 Some(CompletionRelevanceTypeMatch::CouldUnify) 327 Some(CompletionRelevanceTypeMatch::CouldUnify)
328 } else { 328 } else {
329 None 329 None