language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Failed attempt

Browse source
This commit is contained in:
Richard Feldman 2022-08-12 00:14:33 -04:00
parent 394cce74ef
commit d05f9e67e7
No known key found for this signature in database
GPG key ID: F1F21AA5B1D9E43B
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/glue/src/types.rs
View file

@ -634,8 +634,6 @@ impl<'a> Env<'a> {
self.add_type(var, &mut types); self.add_type(var, &mut types);
} }
self.resolve_pending_recursive_types(&mut types);
types types
} }
@ -645,12 +643,16 @@ impl<'a> Env<'a> {
.from_var(self.arena, var, self.subs) .from_var(self.arena, var, self.subs)
.expect("Something weird ended up in the content"); .expect("Something weird ended up in the content");
add_type_help(self, layout, var, None, types) let type_id = add_type_help(self, layout, var, None, types);
self.resolve_pending_recursive_types(types);
type_id
} }
fn resolve_pending_recursive_types(&mut self, types: &mut Types) { fn resolve_pending_recursive_types(&mut self, types: &mut Types) {
// TODO if VecMap gets a drain() method, use that instead of doing take() and into_iter // TODO if VecMap gets a drain() method, use that instead of doing replace() and into_iter
let pending = core::mem::take(&mut self.pending_recursive_types); let pending = core::mem::replace(&mut self.pending_recursive_types, Default::default());
for (type_id, layout) in pending.into_iter() { for (type_id, layout) in pending.into_iter() {
let actual_type_id = self.known_recursive_types.get(&layout).unwrap_or_else(|| { let actual_type_id = self.known_recursive_types.get(&layout).unwrap_or_else(|| {