language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Sort fields in one pass, and drop 0-sized fields

Browse source
This commit is contained in:
Richard Feldman 2020-06-25 01:49:58 -04:00
parent 487c1e3b75
commit ae58ef914d
2 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/mono/src/expr.rs
View file

@ -640,16 +640,16 @@ fn from_can<'a>(
} => {
let arena = env.arena;
let btree = crate::layout::record_fields_btree(
let sorted_fields = crate::layout::sort_record_fields(
env.arena,
record_var,
env.subs,
env.pointer_size,
);
let mut field_tuples = Vec::with_capacity_in(btree.len(), arena);
let mut field_tuples = Vec::with_capacity_in(sorted_fields.len(), arena);
for (label, layout) in btree {
for (label, layout) in sorted_fields {
let field = fields.remove(&label).unwrap();
let expr = from_can(env, field.loc_expr.value, procs, layout_cache);
@ -749,7 +749,7 @@ fn from_can<'a>(
} => {
let arena = env.arena;
let btree = crate::layout::record_fields_btree(
let sorted_fields = crate::layout::sort_record_fields(
env.arena,
record_var,
env.subs,
@ -757,9 +757,9 @@ fn from_can<'a>(
);
let mut index = None;
let mut field_layouts = Vec::with_capacity_in(btree.len(), env.arena);
let mut field_layouts = Vec::with_capacity_in(sorted_fields.len(), env.arena);
for (current, (label, field_layout)) in btree.into_iter().enumerate() {
for (current, (label, field_layout)) in sorted_fields.into_iter().enumerate() {
field_layouts.push(field_layout);
if label == field {
@ -1675,16 +1675,16 @@ fn from_can_pattern<'a>(
let mut it = destructs.iter();
let mut opt_destruct = it.next();
let btree = crate::layout::record_fields_btree(
let sorted_fields = crate::layout::sort_record_fields(
env.arena,
*whole_var,
env.subs,
env.pointer_size,
);
let mut field_layouts = Vec::with_capacity_in(btree.len(), env.arena);
let mut field_layouts = Vec::with_capacity_in(sorted_fields.len(), env.arena);
for (label, field_layout) in btree.into_iter() {
for (label, field_layout) in sorted_fields.into_iter() {
if let Some(destruct) = opt_destruct {
if destruct.value.label == label {
opt_destruct = it.next();