language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix compilation of hir and ide crates

Browse source
This commit is contained in:
Florian Diebold 2021-05-15 20:18:54 +02:00
parent b939a6dcac
commit 48c492af7e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir/src/lib.rs
View file

@ -2223,8 +2223,8 @@ impl Type {
walk_type(db, self, &mut cb); walk_type(db, self, &mut cb);
} }
pub fn could_unify_with(&self, other: &Type) -> bool { pub fn could_unify_with(&self, db: &dyn HirDatabase, other: &Type) -> bool {
could_unify(&self.ty, &other.ty) could_unify(db, self.env.clone(), &self.ty, &other.ty)
} }
} }

2
crates/ide_completion/src/render.rs
View file

@ -323,7 +323,7 @@ fn compute_type_match(
if completion_ty == expected_type { if completion_ty == expected_type {
Some(CompletionRelevanceTypeMatch::Exact) Some(CompletionRelevanceTypeMatch::Exact)
} else if expected_type.could_unify_with(completion_ty) { } else if expected_type.could_unify_with(ctx.db, completion_ty) {
Some(CompletionRelevanceTypeMatch::CouldUnify) Some(CompletionRelevanceTypeMatch::CouldUnify)
} else { } else {
None None