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

Wrap toEncoder derivers in Encode.custom for now

Browse source
This commit is contained in:
Ayaz Hafiz 2022-06-24 15:10:37 -04:00
parent 6f9b3553e4
commit a17748ea01
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/compiler/derive/src/lib.rs
View file

@ -190,7 +190,12 @@ impl DerivedModule {
self.derived_ident_ids = ident_ids; self.derived_ident_ids = ident_ids;
} }
pub fn copy_lambda_set_var_to_subs(&self, var: Variable, target: &mut Subs) -> Variable { pub fn copy_lambda_set_var_to_subs(
&self,
var: Variable,
target: &mut Subs,
target_rank: Rank,
) -> Variable {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
{ {
debug_assert!(!self.stolen); debug_assert!(!self.stolen);
@ -208,7 +213,8 @@ impl DerivedModule {
// //
// However this is a bad coupling and maybe not a good assumption, we should revisit // However this is a bad coupling and maybe not a good assumption, we should revisit
// this when possible. // this when possible.
Rank::toplevel(), // Rank::toplevel(),
target_rank,
); );
copied_import.variable copied_import.variable

3
crates/compiler/test_derive/src/encoding.rs
View file

@ -145,7 +145,7 @@ fn check_derived_typechecks_and_golden(
test_module, test_module,
&mut test_subs, &mut test_subs,
pending_abilities, pending_abilities,
exposed_for_module, &exposed_for_module,
&mut def_types, &mut def_types,
&mut rigid_vars, &mut rigid_vars,
); );
@ -165,6 +165,7 @@ fn check_derived_typechecks_and_golden(
default_aliases(), default_aliases(),
abilities_store, abilities_store,
Default::default(), Default::default(),
&exposed_for_module.exposed_by_module,
Default::default(), Default::default(),
); );
let subs = solved_subs.inner_mut(); let subs = solved_subs.inner_mut();