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

Combine pat_hyigene and expr_hygiene

Browse source
This commit is contained in:
Lukas Wirth 2025-01-25 14:27:47 +01:00
parent b7a3d606ea
commit 6012e961a7
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/hir-def/src/body.rs
View file

@ -3,6 +3,7 @@
mod lower; mod lower;
mod pretty; mod pretty;
pub mod scope; pub mod scope;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
@ -92,11 +93,9 @@ pub struct Body {
binding_hygiene: FxHashMap<BindingId, HygieneId>, binding_hygiene: FxHashMap<BindingId, HygieneId>,
/// A map from an variable usages to their hygiene ID. /// A map from an variable usages to their hygiene ID.
/// ///
/// Expressions that can be recorded here are single segment path, although not all single segments path refer /// Expressions (and destructuing patterns) that can be recorded here are single segment path, although not all single segments path refer
/// to variables and have hygiene (some refer to items, we don't know at this stage). /// to variables and have hygiene (some refer to items, we don't know at this stage).
expr_hygiene: FxHashMap<ExprId, HygieneId>, ident_hygiene: FxHashMap<ExprOrPatId, HygieneId>,
/// A map from a destructuring assignment possible variable usages to their hygiene ID.
pat_hygiene: FxHashMap<PatId, HygieneId>,
} }
pub type ExprPtr = AstPtr<ast::Expr>; pub type ExprPtr = AstPtr<ast::Expr>;
@ -317,8 +316,7 @@ impl Body {
bindings, bindings,
binding_owners, binding_owners,
binding_hygiene, binding_hygiene,
expr_hygiene, ident_hygiene,
pat_hygiene,
types, types,
} = self; } = self;
block_scopes.shrink_to_fit(); block_scopes.shrink_to_fit();
@ -328,8 +326,7 @@ impl Body {
bindings.shrink_to_fit(); bindings.shrink_to_fit();
binding_owners.shrink_to_fit(); binding_owners.shrink_to_fit();
binding_hygiene.shrink_to_fit(); binding_hygiene.shrink_to_fit();
expr_hygiene.shrink_to_fit(); ident_hygiene.shrink_to_fit();
pat_hygiene.shrink_to_fit();
types.shrink_to_fit(); types.shrink_to_fit();
} }
@ -658,11 +655,11 @@ impl Body {
} }
pub fn expr_path_hygiene(&self, expr: ExprId) -> HygieneId { pub fn expr_path_hygiene(&self, expr: ExprId) -> HygieneId {
self.expr_hygiene.get(&expr).copied().unwrap_or(HygieneId::ROOT) self.ident_hygiene.get(&expr.into()).copied().unwrap_or(HygieneId::ROOT)
} }
pub fn pat_path_hygiene(&self, pat: PatId) -> HygieneId { pub fn pat_path_hygiene(&self, pat: PatId) -> HygieneId {
self.pat_hygiene.get(&pat).copied().unwrap_or(HygieneId::ROOT) self.ident_hygiene.get(&pat.into()).copied().unwrap_or(HygieneId::ROOT)
} }
pub fn expr_or_pat_path_hygiene(&self, id: ExprOrPatId) -> HygieneId { pub fn expr_or_pat_path_hygiene(&self, id: ExprOrPatId) -> HygieneId {
@ -686,8 +683,7 @@ impl Default for Body {
binding_owners: Default::default(), binding_owners: Default::default(),
self_param: Default::default(), self_param: Default::default(),
binding_hygiene: Default::default(), binding_hygiene: Default::default(),
expr_hygiene: Default::default(), ident_hygiene: Default::default(),
pat_hygiene: Default::default(),
types: Default::default(), types: Default::default(),
} }
} }

6
crates/hir-def/src/body/lower.rs
View file

@ -480,7 +480,7 @@ impl ExprCollector<'_> {
.unwrap_or((Expr::Missing, HygieneId::ROOT)); .unwrap_or((Expr::Missing, HygieneId::ROOT));
let expr_id = self.alloc_expr(path, syntax_ptr); let expr_id = self.alloc_expr(path, syntax_ptr);
if !hygiene.is_root() { if !hygiene.is_root() {
self.body.expr_hygiene.insert(expr_id, hygiene); self.body.ident_hygiene.insert(expr_id.into(), hygiene);
} }
expr_id expr_id
} }
@ -835,7 +835,7 @@ impl ExprCollector<'_> {
.unwrap_or((Pat::Missing, HygieneId::ROOT)); .unwrap_or((Pat::Missing, HygieneId::ROOT));
let pat_id = self.alloc_pat_from_expr(path, syntax_ptr); let pat_id = self.alloc_pat_from_expr(path, syntax_ptr);
if !hygiene.is_root() { if !hygiene.is_root() {
self.body.pat_hygiene.insert(pat_id, hygiene); self.body.ident_hygiene.insert(pat_id.into(), hygiene);
} }
pat_id pat_id
} }
@ -2023,7 +2023,7 @@ impl ExprCollector<'_> {
); );
} }
if !hygiene.is_root() { if !hygiene.is_root() {
self.body.expr_hygiene.insert(expr_id, hygiene); self.body.ident_hygiene.insert(expr_id.into(), hygiene);
} }
expr_id expr_id
}, },

2
crates/hir-def/src/hir.rs
View file

@ -44,6 +44,8 @@ pub(crate) fn dummy_expr_id() -> ExprId {
pub type PatId = Idx<Pat>; pub type PatId = Idx<Pat>;
// FIXME: Encode this as a single u32, we won't ever reach all 32 bits especially given these counts
// are local to the body.
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
pub enum ExprOrPatId { pub enum ExprOrPatId {
ExprId(ExprId), ExprId(ExprId),