rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/hir/src/source_analyzer.rs')

-rw-r--r--

1 files changed, 5 insertions, 3 deletions

diff --git a/crates/hir/src/source_analyzer.rs b/crates/hir/src/source_analyzer.rs
index 496b6566bd..9f230c2251 100644
--- a/crates/hir/src/source_analyzer.rs
+++ b/crates/hir/src/source_analyzer.rs

@@ -630,7 +630,8 @@ impl SourceAnalyzer {

let (adt, subst) = self.infer.as_ref()?.type_of_expr_or_pat(expr_id)?.as_adt()?;

let variant = self.infer.as_ref()?.variant_resolution_for_expr_or_pat(expr_id)?;

let variant_data = variant.variant_data(db.upcast());

- let field = FieldId { parent: variant, local_id: variant_data.field(&local_name)? };

+ let local_id = variant_data.field(&local_name)?;

+ let field = FieldId { parent: variant, local_id };

let field_ty =

db.field_types(variant).get(field.local_id)?.clone().substitute(Interner, subst);

Some((

@@ -651,7 +652,8 @@ impl SourceAnalyzer {

let pat_id = self.pat_id(&record_pat.into())?;

let variant = self.infer.as_ref()?.variant_resolution_for_pat(pat_id)?;

let variant_data = variant.variant_data(db.upcast());

- let field = FieldId { parent: variant, local_id: variant_data.field(&field_name)? };

+ let local_id = variant_data.field(&field_name)?;

+ let field = FieldId { parent: variant, local_id };

let (adt, subst) = self.infer.as_ref()?.type_of_pat.get(pat_id)?.as_adt()?;

let field_ty =

db.field_types(variant).get(field.local_id)?.clone().substitute(Interner, subst);

@@ -1023,7 +1025,7 @@ impl SourceAnalyzer {

let expr_id = self.expr_id(db, &literal.clone().into())?;

let substs = infer[expr_id].as_adt()?.1;

- let (variant, missing_fields, _exhaustive) = match expr_id {

+ let (variant, missing_fields, _) = match expr_id {

ExprOrPatId::ExprId(expr_id) => {

record_literal_missing_fields(db, infer, expr_id, &body[expr_id])?

}