From 559a09c5e6dc55717f97c3664f73ec65f736583f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Wed, 4 Jan 2023 17:21:09 +0300
Subject: refactor(tvix/eval): remove `Box` in new_suspended_native

This is unnecessary, Rc already provides all the boxing we need.

Change-Id: I08cf0939c48da43f04c847526c7e5dae5336d528
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7749
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>
---
 tvix/eval/src/builtins/impure.rs | 4 ++--
 tvix/eval/src/compiler/mod.rs    | 4 ++--
 tvix/eval/src/value/thunk.rs     | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'tvix/eval/src')

diff --git a/tvix/eval/src/builtins/impure.rs b/tvix/eval/src/builtins/impure.rs
index e8c032cc77e6..0cebd5f6ab58 100644
--- a/tvix/eval/src/builtins/impure.rs
+++ b/tvix/eval/src/builtins/impure.rs
@@ -72,12 +72,12 @@ pub fn impure_builtins() -> Vec<(&'static str, Value)> {
 
     result.push((
         "storeDir",
-        Value::Thunk(Thunk::new_suspended_native(Rc::new(Box::new(
+        Value::Thunk(Thunk::new_suspended_native(Rc::new(
             |vm: &mut VM| match vm.io().store_dir() {
                 None => Ok(Value::Null),
                 Some(dir) => Ok(Value::String(dir.into())),
             },
-        )))),
+        ))),
     ));
 
     // currentTime pins the time at which evaluation was started
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs
index 605fce47490f..92084b031c6c 100644
--- a/tvix/eval/src/compiler/mod.rs
+++ b/tvix/eval/src/compiler/mod.rs
@@ -1288,7 +1288,7 @@ pub fn prepare_globals(
         let weak_globals = weak.clone();
         builtins_under_construction.insert(
             "builtins",
-            Value::Thunk(Thunk::new_suspended_native(Rc::new(Box::new(move |_| {
+            Value::Thunk(Thunk::new_suspended_native(Rc::new(move |_| {
                 let file = source.add_file("builtins-dot-builtins.nix".into(), "builtins".into());
                 let span = file.span;
                 let mut observer = NoOpObserver::default();
@@ -1305,7 +1305,7 @@ pub fn prepare_globals(
                 weak_globals.upgrade().unwrap().get("builtins").unwrap()(&mut compiler, span);
 
                 Ok(compiler.chunk().constants[0].clone())
-            })))),
+            }))),
         );
 
         // This is followed by the actual `builtins` attribute set
diff --git a/tvix/eval/src/value/thunk.rs b/tvix/eval/src/value/thunk.rs
index a820e73307ad..716cf4404e2e 100644
--- a/tvix/eval/src/value/thunk.rs
+++ b/tvix/eval/src/value/thunk.rs
@@ -86,9 +86,7 @@ impl Thunk {
         })))
     }
 
-    pub fn new_suspended_native(
-        native: Rc<Box<dyn Fn(&mut VM) -> Result<Value, ErrorKind>>>,
-    ) -> Self {
+    pub fn new_suspended_native(native: Rc<dyn Fn(&mut VM) -> Result<Value, ErrorKind>>) -> Self {
         let span = codemap::CodeMap::new()
             .add_file("<internal>".to_owned(), "<internal>".to_owned())
             .span;
-- 
cgit 1.4.1