diff options
author | Aspen Smith <root@gws.fyi> | 2024-02-10T17·39-0500 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-02-13T16·49+0000 |
commit | 7e286aab1a573edc9aef16bb68e9907371917adc (patch) | |
tree | f3e9aeb1ac674800ed13dbb0bfacddfb50dd372e /tvix/eval/src/builtins/impure.rs | |
parent | dd261773192d0928571f806892d8065fbba1cf2d (diff) |
feat(tvix/eval): Box Value::Catchable r/7508
This is now the only enum variant for Value that is larger than 8 bytes (it's 16 bytes), so boxing it (especially since it's not perf-critical) allows us to get the Value size down to only 16 bytes! Change-Id: I98598e2b762944448bef982e8ff7da6d6683c4aa Reviewed-on: https://cl.tvl.fyi/c/depot/+/10798 Tested-by: BuildkiteCI Reviewed-by: raitobezarius <tvl@lahfa.xyz> Autosubmit: aspen <root@gws.fyi>
Diffstat (limited to 'tvix/eval/src/builtins/impure.rs')
-rw-r--r-- | tvix/eval/src/builtins/impure.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/eval/src/builtins/impure.rs b/tvix/eval/src/builtins/impure.rs index 5852f148fe6e..def6ce29094c 100644 --- a/tvix/eval/src/builtins/impure.rs +++ b/tvix/eval/src/builtins/impure.rs @@ -33,7 +33,7 @@ mod impure_builtins { #[builtin("pathExists")] async fn builtin_path_exists(co: GenCo, path: Value) -> Result<Value, ErrorKind> { match coerce_value_to_path(&co, path).await? { - Err(cek) => Ok(Value::Catchable(cek)), + Err(cek) => Ok(Value::from(cek)), Ok(path) => Ok(generators::request_path_exists(&co, path).await), } } @@ -41,7 +41,7 @@ mod impure_builtins { #[builtin("readDir")] async fn builtin_read_dir(co: GenCo, path: Value) -> Result<Value, ErrorKind> { match coerce_value_to_path(&co, path).await? { - Err(cek) => Ok(Value::Catchable(cek)), + Err(cek) => Ok(Value::from(cek)), Ok(path) => { let dir = generators::request_read_dir(&co, path).await; let res = dir.into_iter().map(|(name, ftype)| { @@ -67,7 +67,7 @@ mod impure_builtins { #[builtin("readFile")] async fn builtin_read_file(co: GenCo, path: Value) -> Result<Value, ErrorKind> { match coerce_value_to_path(&co, path).await? { - Err(cek) => Ok(Value::Catchable(cek)), + Err(cek) => Ok(Value::from(cek)), Ok(path) => Ok(generators::request_read_to_string(&co, path).await), } } |