1 files changed, 4 insertions, 21 deletions

diff --git a/crates/ide_completion/src/render.rs b/crates/ide_completion/src/render.rs
index 905f0b197..670563e50 100644
--- a/crates/ide_completion/src/render.rs
+++ b/crates/ide_completion/src/render.rs
@@ -118,19 +118,6 @@ impl<'a> RenderContext<'a> {
     fn docs(&self, node: impl HasAttrs) -> Option<Documentation> {
         node.docs(self.db())
     }
-
-    fn expected_name_and_type(&self) -> Option<(String, Type)> {
-        if let Some(record_field) = &self.completion.record_field_syntax {
-            cov_mark::hit!(record_field_type_match);
-            let (struct_field, _local) = self.completion.sema.resolve_record_field(record_field)?;
-            Some((struct_field.name(self.db()).to_string(), struct_field.signature_ty(self.db())))
-        } else if let Some(active_parameter) = &self.completion.active_parameter {
-            cov_mark::hit!(active_param_type_match);
-            Some((active_parameter.name.clone(), active_parameter.ty.clone()))
-        } else {
-            None
-        }
-    }
 }
 
 /// Generic renderer for completion items.
@@ -256,8 +243,8 @@ impl<'a> Render<'a> {
             relevance.is_local = true;
             item.set_relevance(relevance);
 
-            if let Some((_expected_name, expected_type)) = self.ctx.expected_name_and_type() {
-                if ty != expected_type {
+            if let Some(expected_type) = self.ctx.completion.expected_type.as_ref() {
+                if &ty != expected_type {
                     if let Some(ty_without_ref) = expected_type.remove_ref() {
                         if relevance_type_match(self.ctx.db().upcast(), &ty, &ty_without_ref) {
                             cov_mark::hit!(suggest_ref);
@@ -329,10 +316,8 @@ impl<'a> Render<'a> {
 fn compute_relevance(ctx: &RenderContext, ty: &Type, name: &str) -> CompletionRelevance {
     let mut res = CompletionRelevance::default();
 
-    if let Some((expected_name, expected_type)) = ctx.expected_name_and_type() {
-        res.exact_type_match = ty == &expected_type;
-        res.exact_name_match = name == &expected_name;
-    }
+    res.exact_type_match = Some(ty) == ctx.completion.expected_type.as_ref();
+    res.exact_name_match = Some(name) == ctx.completion.expected_name.as_deref();
 
     res
 }
@@ -852,7 +837,6 @@ fn foo(xs: Vec<i128>)
 
     #[test]
     fn active_param_relevance() {
-        cov_mark::check!(active_param_type_match);
         check_relevance(
             r#"
 struct S { foo: i64, bar: u32, baz: u32 }
@@ -869,7 +853,6 @@ fn foo(s: S) { test(s.$0) }
 
     #[test]
     fn record_field_relevances() {
-        cov_mark::check!(record_field_type_match);
         check_relevance(
             r#"
 struct A { foo: i64, bar: u32, baz: u32 }