mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

internal: Replace Vec with Box in hir Expr

Browse Source
This commit is contained in:
Lukas Wirth 2021-11-20 16:00:45 +01:00
parent 14dff25107
commit cc327774b7
5 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crates/hir_def/src/body/lower.rs
View File

@ -130,11 +130,7 @@ impl ExprCollector<'_> {
self.body.params.push(param_pat); self.body.params.push(param_pat);
} }
for param in param_list.params() { for pat in param_list.params().filter_map(|param| param.pat()) {
let pat = match param.pat() {
None => continue,
Some(pat) => pat,
};
let param_pat = self.collect_pat(pat); let param_pat = self.collect_pat(pat);
self.body.params.push(param_pat); self.body.params.push(param_pat);
} }
@ -160,7 +156,7 @@ impl ExprCollector<'_> {
self.make_expr(expr, Err(SyntheticSyntax)) self.make_expr(expr, Err(SyntheticSyntax))
} }
fn unit(&mut self) -> ExprId { fn unit(&mut self) -> ExprId {
self.alloc_expr_desugared(Expr::Tuple { exprs: Vec::new() }) self.alloc_expr_desugared(Expr::Tuple { exprs: Box::default() })
} }
fn missing_expr(&mut self) -> ExprId { fn missing_expr(&mut self) -> ExprId {
self.alloc_expr_desugared(Expr::Missing) self.alloc_expr_desugared(Expr::Missing)
@ -235,7 +231,8 @@ impl ExprCollector<'_> {
expr: else_branch.unwrap_or_else(|| self.unit()), expr: else_branch.unwrap_or_else(|| self.unit()),
guard: None, guard: None,
}, },
]; ]
.into();
return Some( return Some(
self.alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr), self.alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr),
); );
@ -300,7 +297,8 @@ impl ExprCollector<'_> {
let arms = vec![ let arms = vec![
MatchArm { pat, expr: body, guard: None }, MatchArm { pat, expr: body, guard: None },
MatchArm { pat: placeholder_pat, expr: break_, guard: None }, MatchArm { pat: placeholder_pat, expr: break_, guard: None },
]; ]
.into();
let match_expr = let match_expr =
self.alloc_expr_desugared(Expr::Match { expr: match_expr, arms }); self.alloc_expr_desugared(Expr::Match { expr: match_expr, arms });
return Some( return Some(
@ -324,7 +322,7 @@ impl ExprCollector<'_> {
let args = if let Some(arg_list) = e.arg_list() { let args = if let Some(arg_list) = e.arg_list() {
arg_list.args().filter_map(|e| self.maybe_collect_expr(e)).collect() arg_list.args().filter_map(|e| self.maybe_collect_expr(e)).collect()
} else { } else {
Vec::new() Box::default()
}; };
self.alloc_expr(Expr::Call { callee, args }, syntax_ptr) self.alloc_expr(Expr::Call { callee, args }, syntax_ptr)
} }
@ -333,7 +331,7 @@ impl ExprCollector<'_> {
let args = if let Some(arg_list) = e.arg_list() { let args = if let Some(arg_list) = e.arg_list() {
arg_list.args().filter_map(|e| self.maybe_collect_expr(e)).collect() arg_list.args().filter_map(|e| self.maybe_collect_expr(e)).collect()
} else { } else {
Vec::new() Box::default()
}; };
let method_name = e.name_ref().map(|nr| nr.as_name()).unwrap_or_else(Name::missing); let method_name = e.name_ref().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
let generic_args = e let generic_args = e
@ -367,7 +365,7 @@ impl ExprCollector<'_> {
}) })
.collect() .collect()
} else { } else {
Vec::new() Box::default()
}; };
self.alloc_expr(Expr::Match { expr, arms }, syntax_ptr) self.alloc_expr(Expr::Match { expr, arms }, syntax_ptr)
} }
@ -429,7 +427,7 @@ impl ExprCollector<'_> {
let spread = nfl.spread().map(|s| self.collect_expr(s)); let spread = nfl.spread().map(|s| self.collect_expr(s));
Expr::RecordLit { path, fields, spread } Expr::RecordLit { path, fields, spread }
} else { } else {
Expr::RecordLit { path, fields: Vec::new(), spread: None } Expr::RecordLit { path, fields: Box::default(), spread: None }
}; };
self.alloc_expr(record_lit, syntax_ptr) self.alloc_expr(record_lit, syntax_ptr)
@ -496,7 +494,10 @@ impl ExprCollector<'_> {
.and_then(|r| r.ty()) .and_then(|r| r.ty())
.map(|it| Interned::new(TypeRef::from_ast(&self.ctx(), it))); .map(|it| Interned::new(TypeRef::from_ast(&self.ctx(), it)));
let body = self.collect_expr_opt(e.body()); let body = self.collect_expr_opt(e.body());
self.alloc_expr(Expr::Lambda { args, arg_types, ret_type, body }, syntax_ptr) self.alloc_expr(
Expr::Lambda { args: args.into(), arg_types: arg_types.into(), ret_type, body },
syntax_ptr,
)
} }
ast::Expr::BinExpr(e) => { ast::Expr::BinExpr(e) => {
let lhs = self.collect_expr_opt(e.lhs()); let lhs = self.collect_expr_opt(e.lhs());
@ -718,7 +719,7 @@ impl ExprCollector<'_> {
self.statements_in_scope.pop(); self.statements_in_scope.pop();
} }
let tail = tail; let tail = tail;
let statements = std::mem::replace(&mut self.statements_in_scope, prev_statements); let statements = std::mem::replace(&mut self.statements_in_scope, prev_statements).into();
let syntax_node_ptr = AstPtr::new(&block.into()); let syntax_node_ptr = AstPtr::new(&block.into());
let expr_id = self.alloc_expr( let expr_id = self.alloc_expr(
Expr::Block { id: block_id, statements, tail, label: None }, Expr::Block { id: block_id, statements, tail, label: None },

2
crates/hir_def/src/body/scope.rs
View File

@ -204,7 +204,7 @@ fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope
} }
Expr::Match { expr, arms } => { Expr::Match { expr, arms } => {
compute_expr_scopes(*expr, body, scopes, scope); compute_expr_scopes(*expr, body, scopes, scope);
for arm in arms { for arm in arms.iter() {
let mut scope = scopes.new_scope(scope); let mut scope = scopes.new_scope(scope);
scopes.add_bindings(body, scope, arm.pat); scopes.add_bindings(body, scope, arm.pat);
match arm.guard { match arm.guard {

28
crates/hir_def/src/expr.rs
View File

@ -61,7 +61,7 @@ pub enum Expr {
}, },
Block { Block {
id: BlockId, id: BlockId,
statements: Vec<Statement>, statements: Box<[Statement]>,
tail: Option<ExprId>, tail: Option<ExprId>,
label: Option<LabelId>, label: Option<LabelId>,
}, },
@ -82,17 +82,17 @@ pub enum Expr {
}, },
Call { Call {
callee: ExprId, callee: ExprId,
args: Vec<ExprId>, args: Box<[ExprId]>,
}, },
MethodCall { MethodCall {
receiver: ExprId, receiver: ExprId,
method_name: Name, method_name: Name,
args: Vec<ExprId>, args: Box<[ExprId]>,
generic_args: Option<Box<GenericArgs>>, generic_args: Option<Box<GenericArgs>>,
}, },
Match { Match {
expr: ExprId, expr: ExprId,
arms: Vec<MatchArm>, arms: Box<[MatchArm]>,
}, },
Continue { Continue {
label: Option<Name>, label: Option<Name>,
@ -109,7 +109,7 @@ pub enum Expr {
}, },
RecordLit { RecordLit {
path: Option<Box<Path>>, path: Option<Box<Path>>,
fields: Vec<RecordLitField>, fields: Box<[RecordLitField]>,
spread: Option<ExprId>, spread: Option<ExprId>,
}, },
Field { Field {
@ -162,13 +162,13 @@ pub enum Expr {
index: ExprId, index: ExprId,
}, },
Lambda { Lambda {
args: Vec<PatId>, args: Box<[PatId]>,
arg_types: Vec<Option<Interned<TypeRef>>>, arg_types: Box<[Option<Interned<TypeRef>>]>,
ret_type: Option<Interned<TypeRef>>, ret_type: Option<Interned<TypeRef>>,
body: ExprId, body: ExprId,
}, },
Tuple { Tuple {
exprs: Vec<ExprId>, exprs: Box<[ExprId]>,
}, },
Unsafe { Unsafe {
body: ExprId, body: ExprId,
@ -233,7 +233,7 @@ impl Expr {
} }
} }
Expr::Block { statements, tail, .. } => { Expr::Block { statements, tail, .. } => {
for stmt in statements { for stmt in statements.iter() {
match stmt { match stmt {
Statement::Let { initializer, .. } => { Statement::Let { initializer, .. } => {
if let Some(expr) = initializer { if let Some(expr) = initializer {
@ -262,19 +262,19 @@ impl Expr {
} }
Expr::Call { callee, args } => { Expr::Call { callee, args } => {
f(*callee); f(*callee);
for arg in args { for arg in args.iter() {
f(*arg); f(*arg);
} }
} }
Expr::MethodCall { receiver, args, .. } => { Expr::MethodCall { receiver, args, .. } => {
f(*receiver); f(*receiver);
for arg in args { for arg in args.iter() {
f(*arg); f(*arg);
} }
} }
Expr::Match { expr, arms } => { Expr::Match { expr, arms } => {
f(*expr); f(*expr);
for arm in arms { for arm in arms.iter() {
f(arm.expr); f(arm.expr);
} }
} }
@ -285,7 +285,7 @@ impl Expr {
} }
} }
Expr::RecordLit { fields, spread, .. } => { Expr::RecordLit { fields, spread, .. } => {
for field in fields { for field in fields.iter() {
f(field.expr); f(field.expr);
} }
if let Some(expr) = spread { if let Some(expr) = spread {
@ -321,7 +321,7 @@ impl Expr {
f(*expr); f(*expr);
} }
Expr::Tuple { exprs } => { Expr::Tuple { exprs } => {
for expr in exprs { for expr in exprs.iter() {
f(*expr); f(*expr);
} }
} }

10
crates/hir_ty/src/diagnostics/expr.rs
View File

@ -202,19 +202,16 @@ impl ExprValidator {
} }
let is_method_call = matches!(expr, Expr::MethodCall { .. }); let is_method_call = matches!(expr, Expr::MethodCall { .. });
let (sig, args) = match expr { let (sig, mut arg_count) = match expr {
Expr::Call { callee, args } => { Expr::Call { callee, args } => {
let callee = &self.infer.type_of_expr[*callee]; let callee = &self.infer.type_of_expr[*callee];
let sig = match callee.callable_sig(db) { let sig = match callee.callable_sig(db) {
Some(sig) => sig, Some(sig) => sig,
None => return, None => return,
}; };
(sig, args.clone()) (sig, args.len())
} }
Expr::MethodCall { receiver, args, .. } => { Expr::MethodCall { receiver, args, .. } => {
let mut args = args.clone();
args.insert(0, *receiver);
let receiver = &self.infer.type_of_expr[*receiver]; let receiver = &self.infer.type_of_expr[*receiver];
if receiver.strip_references().is_unknown() { if receiver.strip_references().is_unknown() {
// if the receiver is of unknown type, it's very likely we // if the receiver is of unknown type, it's very likely we
@ -229,7 +226,7 @@ impl ExprValidator {
}; };
let sig = db.callable_item_signature(callee.into()).substitute(&Interner, &subst); let sig = db.callable_item_signature(callee.into()).substitute(&Interner, &subst);
(sig, args) (sig, args.len() + 1)
} }
_ => return, _ => return,
}; };
@ -241,7 +238,6 @@ impl ExprValidator {
let params = sig.params(); let params = sig.params();
let mut param_count = params.len(); let mut param_count = params.len();
let mut arg_count = args.len();
if arg_count != param_count { if arg_count != param_count {
if is_method_call { if is_method_call {

2
crates/hir_ty/src/infer/expr.rs
View File

@ -375,7 +375,7 @@ impl<'a> InferenceContext<'a> {
let matchee_diverges = self.diverges; let matchee_diverges = self.diverges;
let mut all_arms_diverge = Diverges::Always; let mut all_arms_diverge = Diverges::Always;
for arm in arms { for arm in arms.iter() {
self.diverges = Diverges::Maybe; self.diverges = Diverges::Maybe;
let _pat_ty = self.infer_pat(arm.pat, &input_ty, BindingMode::default()); let _pat_ty = self.infer_pat(arm.pat, &input_ty, BindingMode::default());
match arm.guard { match arm.guard {