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

infer: remove record_pat_field_resolutions field

Browse source 
Same as https://github.com/rust-analyzer/rust-analyzer/pull/8376, this
can be computed from other data
This commit is contained in:
Jonas Schievink 2021-04-06 19:44:28 +02:00
parent e6a1c9ca60
commit 230c763648
3 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/hir/src/source_analyzer.rs
View file

@ -185,12 +185,16 @@ impl SourceAnalyzer {
pub(crate) fn resolve_record_pat_field(
&self,
_db: &dyn HirDatabase,
db: &dyn HirDatabase,
field: &ast::RecordPatField,
) -> Option<Field> {
let pat_id = self.pat_id(&field.pat()?)?;
let struct_field = self.infer.as_ref()?.record_pat_field_resolution(pat_id)?;
Some(struct_field.into())
let field_name = field.field_name()?.as_name();
let record_pat = ast::RecordPat::cast(field.syntax().parent().and_then(|p| p.parent())?)?;
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)? };
Some(field.into())
}
pub(crate) fn resolve_macro_call(