From d05f9e67e76a132cdcd404d64731ccb877319972 Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Fri, 12 Aug 2022 00:14:33 -0400 Subject: [PATCH] Failed attempt --- crates/glue/src/types.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/crates/glue/src/types.rs b/crates/glue/src/types.rs index 93a598cc81..6e910b4e3a 100644 --- a/crates/glue/src/types.rs +++ b/crates/glue/src/types.rs @@ -634,8 +634,6 @@ impl<'a> Env<'a> { self.add_type(var, &mut types); } - self.resolve_pending_recursive_types(&mut types); - types } @@ -645,12 +643,16 @@ impl<'a> Env<'a> { .from_var(self.arena, var, self.subs) .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) { - // TODO if VecMap gets a drain() method, use that instead of doing take() and into_iter - let pending = core::mem::take(&mut self.pending_recursive_types); + // TODO if VecMap gets a drain() method, use that instead of doing replace() and into_iter + let pending = core::mem::replace(&mut self.pending_recursive_types, Default::default()); for (type_id, layout) in pending.into_iter() { let actual_type_id = self.known_recursive_types.get(&layout).unwrap_or_else(|| {