lifetimes: Reuse Heap for some modules in a test

Summary: This is representative of the issue - this test allocates a starlark value using one heap and then references that starlark value from other heaps. When we started branding the modules (future diff) that stopped compiling. Fix this by using the same heap for all three modules

Reviewed By: ship-it-ship-it

Differential Revision: D90475056

fbshipit-source-id: 27db72115f95b662d4c0f41cf5cf59b46ca1698b

Author: JakobDegen

starlark/src/eval/runtime/profile/heap.rs

@@ -269,6 +269,7 @@ mod tests {
     use crate::eval::runtime::profile::mode::ProfileMode;
     use crate::syntax::AstModule;
     use crate::syntax::Dialect;
+    use crate::values::Heap;
     use crate::values::Value;
 
     #[test]
@@ -286,41 +287,41 @@ f
             &Dialect::AllOptionsInternal,
         )?;
         let globals = Globals::standard();
-        Module::with_temp_heap(|module| {
-            Module::with_temp_heap(|module2| {
-                Module::with_temp_heap(|module3| {
-                    let mut eval = Evaluator::new(&module);
-                    eval.enable_profile(&ProfileMode::HeapSummaryAllocated)
-                        .unwrap();
-                    let f = eval.eval_module(ast, &globals)?;
-
-                    // first check module profiling works
-                    HeapProfile::write_summarized_heap_profile(module.heap());
-                    HeapProfile::write_flame_heap_profile(module.heap());
-
-                    // second check function profiling works
-                    let mut eval = Evaluator::new(&module2);
-                    eval.enable_profile(&ProfileMode::HeapSummaryAllocated)
-                        .unwrap();
-                    eval.eval_function(f, &[Value::testing_new_int(100)], &[])?;
-
-                    HeapProfile::write_summarized_heap_profile(module2.heap());
-                    HeapProfile::write_flame_heap_profile(module2.heap());
-
-                    // finally, check a user can add values into the heap before/after
-                    let mut eval = Evaluator::new(&module3);
-                    module3.heap().alloc("Thing that goes before");
-                    eval.enable_profile(&ProfileMode::HeapSummaryAllocated)
-                        .unwrap();
-                    eval.eval_function(f, &[Value::testing_new_int(100)], &[])?;
-
-                    module3.heap().alloc("Thing that goes after");
-                    HeapProfile::write_summarized_heap_profile(module3.heap());
-                    HeapProfile::write_flame_heap_profile(module3.heap());
-
-                    Ok(())
-                })
-            })
+        Heap::temp(|heap| {
+            let module = Module::with_heap(heap);
+            let module2 = Module::with_heap(heap);
+            let module3 = Module::with_heap(heap);
+
+            let mut eval = Evaluator::new(&module);
+            eval.enable_profile(&ProfileMode::HeapSummaryAllocated)
+                .unwrap();
+            let f = eval.eval_module(ast, &globals)?;
+
+            // first check module profiling works
+            HeapProfile::write_summarized_heap_profile(module.heap());
+            HeapProfile::write_flame_heap_profile(module.heap());
+
+            // second check function profiling works
+            let mut eval = Evaluator::new(&module2);
+            eval.enable_profile(&ProfileMode::HeapSummaryAllocated)
+                .unwrap();
+            eval.eval_function(f, &[Value::testing_new_int(100)], &[])?;
+
+            HeapProfile::write_summarized_heap_profile(module2.heap());
+            HeapProfile::write_flame_heap_profile(module2.heap());
+
+            // finally, check a user can add values into the heap before/after
+            let mut eval = Evaluator::new(&module3);
+            module3.heap().alloc("Thing that goes before");
+            eval.enable_profile(&ProfileMode::HeapSummaryAllocated)
+                .unwrap();
+            eval.eval_function(f, &[Value::testing_new_int(100)], &[])?;
+
+            module3.heap().alloc("Thing that goes after");
+            HeapProfile::write_summarized_heap_profile(module3.heap());
+            HeapProfile::write_flame_heap_profile(module3.heap());
+
+            Ok(())
         })
     }
 }