language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-16 01:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix derive tests

Browse source
This commit is contained in:
Ayaz Hafiz 2022-07-12 14:21:56 -04:00
parent a7b06fd7cf
commit b782f013bd
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
3 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,12 +22,12 @@ use roc_can::{
use roc_collections::VecSet;
use roc_constrain::expr::constrain_decls;
use roc_debug_flags::dbg_do;
use roc_derive::{synth_var, DerivedModule, StolenFromDerived};
use roc_derive::{synth_var, DerivedModule};
use roc_derive_key::{DeriveKey, Derived};
use roc_load_internal::file::{add_imports, default_aliases, LoadedModule, Threading};
use roc_module::{
ident::TagName,
symbol::{Interns, ModuleId, Symbol},
symbol::{IdentIds, Interns, ModuleId, Symbol},
};
use roc_region::all::LineInfo;
use roc_reporting::report::{type_problem, RocDocAllocator};
@ -244,12 +244,12 @@ where
)
.unwrap();
let mut derived_module = DerivedModule::default();
let mut subs = Subs::new();
let ident_ids = IdentIds::default();
let source_var = synth_input(&mut subs);
let key = get_key(&subs, source_var);
let mut stolen = derived_module.steal();
let source_var = synth_input(&mut stolen.subs);
let key = get_key(&stolen.subs, source_var);
derived_module.return_stolen(stolen);
let mut derived_module = unsafe { DerivedModule::from_components(subs, ident_ids) };
let mut exposed_by_module = ExposedByModule::default();
exposed_by_module.insert(
@ -260,13 +260,12 @@ where
},
);
let (derived_symbol, derived_def, specialization_lsets) =
let (_derived_symbol, derived_def, specialization_lsets) =
derived_module.get_or_insert(&exposed_by_module, key);
let derived_symbol = *derived_symbol;
let specialization_lsets = specialization_lsets.clone();
let derived_def = derived_def.clone();
let StolenFromDerived { ident_ids, subs } = derived_module.steal();
let (subs, ident_ids) = derived_module.decompose();
interns.all_ident_ids.insert(DERIVED_MODULE, ident_ids);
DERIVED_MODULE.register_debug_idents(interns.all_ident_ids.get(&DERIVED_MODULE).unwrap());