language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix silent merge request wrt record accessors

Browse source
This commit is contained in:
Folkert 2023-01-25 00:02:19 +01:00
parent ad84e02abf
commit 3417a0e059
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/compiler/can/src/def.rs
View file

@ -11,11 +11,11 @@ use crate::annotation::OwnedNamedOrAble;
use crate::derive; use crate::derive;
use crate::env::Env; use crate::env::Env;
use crate::expr::get_lookup_symbols; use crate::expr::get_lookup_symbols;
use crate::expr::AccessorData;
use crate::expr::AnnotatedMark; use crate::expr::AnnotatedMark;
use crate::expr::ClosureData; use crate::expr::ClosureData;
use crate::expr::Declarations; use crate::expr::Declarations;
use crate::expr::Expr::{self, *}; use crate::expr::Expr::{self, *};
use crate::expr::RecordAccessorData;
use crate::expr::{canonicalize_expr, Output, Recursive}; use crate::expr::{canonicalize_expr, Output, Recursive};
use crate::pattern::{canonicalize_def_header_pattern, BindingsFromPattern, Pattern}; use crate::pattern::{canonicalize_def_header_pattern, BindingsFromPattern, Pattern};
use crate::procedure::References; use crate::procedure::References;
@ -2321,7 +2321,7 @@ fn canonicalize_pending_body<'a>(
let (loc_can_expr, can_output) = ( let (loc_can_expr, can_output) = (
Loc::at( Loc::at(
loc_expr.region, loc_expr.region,
Accessor(AccessorData { RecordAccessor(RecordAccessorData {
name: *defined_symbol, name: *defined_symbol,
function_var: var_store.fresh(), function_var: var_store.fresh(),
record_var: var_store.fresh(), record_var: var_store.fresh(),

2
crates/compiler/load_internal/src/file.rs
View file

@ -5785,7 +5785,7 @@ fn build_pending_specializations<'a>(
} }
match body.value { match body.value {
roc_can::expr::Expr::Accessor(accessor_data) => { roc_can::expr::Expr::RecordAccessor(accessor_data) => {
let fresh_record_symbol = mono_env.unique_symbol(); let fresh_record_symbol = mono_env.unique_symbol();
let closure_data = accessor_data.to_closure_data(fresh_record_symbol); let closure_data = accessor_data.to_closure_data(fresh_record_symbol);
register_toplevel_function_into_procs_base( register_toplevel_function_into_procs_base(

2
crates/compiler/mono/src/ir.rs
View file

@ -2389,7 +2389,7 @@ fn from_can_let<'a>(
lower_rest!(variable, cont.value) lower_rest!(variable, cont.value)
} }
Accessor(accessor_data) => { RecordAccessor(accessor_data) => {
let fresh_record_symbol = env.unique_symbol(); let fresh_record_symbol = env.unique_symbol();
let closure_data = accessor_data.to_closure_data(fresh_record_symbol); let closure_data = accessor_data.to_closure_data(fresh_record_symbol);
debug_assert_eq!(*symbol, closure_data.name); debug_assert_eq!(*symbol, closure_data.name);