diff options
Diffstat (limited to 'crates/hir/src/source_analyzer.rs')
-rw-r--r-- | crates/hir/src/source_analyzer.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir/src/source_analyzer.rs b/crates/hir/src/source_analyzer.rs index 4d59293e9..37d162b32 100644 --- a/crates/hir/src/source_analyzer.rs +++ b/crates/hir/src/source_analyzer.rs | |||
@@ -20,7 +20,7 @@ use hir_def::{ | |||
20 | use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile}; | 20 | use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile}; |
21 | use hir_ty::{ | 21 | use hir_ty::{ |
22 | diagnostics::{record_literal_missing_fields, record_pattern_missing_fields}, | 22 | diagnostics::{record_literal_missing_fields, record_pattern_missing_fields}, |
23 | InferenceResult, Substs, | 23 | InferenceResult, Substitution, |
24 | }; | 24 | }; |
25 | use syntax::{ | 25 | use syntax::{ |
26 | ast::{self, AstNode}, | 26 | ast::{self, AstNode}, |
@@ -329,7 +329,7 @@ impl SourceAnalyzer { | |||
329 | &self, | 329 | &self, |
330 | db: &dyn HirDatabase, | 330 | db: &dyn HirDatabase, |
331 | krate: CrateId, | 331 | krate: CrateId, |
332 | substs: &Substs, | 332 | substs: &Substitution, |
333 | variant: VariantId, | 333 | variant: VariantId, |
334 | missing_fields: Vec<LocalFieldId>, | 334 | missing_fields: Vec<LocalFieldId>, |
335 | ) -> Vec<(Field, Type)> { | 335 | ) -> Vec<(Field, Type)> { |
@@ -484,7 +484,7 @@ fn resolve_hir_path_( | |||
484 | resolver.resolve_path_in_value_ns_fully(db.upcast(), path.mod_path()).and_then(|val| { | 484 | resolver.resolve_path_in_value_ns_fully(db.upcast(), path.mod_path()).and_then(|val| { |
485 | let res = match val { | 485 | let res = match val { |
486 | ValueNs::LocalBinding(pat_id) => { | 486 | ValueNs::LocalBinding(pat_id) => { |
487 | let var = Local { parent: body_owner?.into(), pat_id }; | 487 | let var = Local { parent: body_owner?, pat_id }; |
488 | PathResolution::Local(var) | 488 | PathResolution::Local(var) |
489 | } | 489 | } |
490 | ValueNs::FunctionId(it) => PathResolution::Def(Function::from(it).into()), | 490 | ValueNs::FunctionId(it) => PathResolution::Def(Function::from(it).into()), |