From b78ae941a48bc7105ac964701a9e2c268b12d2ef Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 17 Mar 2023 21:51:20 +0300 Subject: fix(tvix/eval): use coerce_to_string in builtins.substring This actually uses coercion under the hood in C++ Nix. See the test for an example. Change-Id: Id56b364acf269225b6829d0b600e0222f8b3608d Reviewed-on: https://cl.tvl.fyi/c/depot/+/8322 Reviewed-by: andi Tested-by: BuildkiteCI --- tvix/eval/src/builtins/mod.rs | 2 +- .../src/tests/tvix_tests/eval-okay-builtins-substring-coerce.exp | 1 + .../src/tests/tvix_tests/eval-okay-builtins-substring-coerce.nix | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-substring-coerce.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-substring-coerce.nix diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index c56c53e465..464809b270 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -835,7 +835,7 @@ mod pure_builtins { ) -> Result { let beg = start.as_int()?; let len = len.as_int()?; - let x = s.to_str()?; + let x = s.coerce_to_string(co, CoercionKind::Weak).await?.to_str()?; if beg < 0 { return Err(ErrorKind::IndexOutOfBounds { index: beg }); diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-substring-coerce.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-substring-coerce.exp new file mode 100644 index 0000000000..192548e949 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-substring-coerce.exp @@ -0,0 +1 @@ +"42" diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-substring-coerce.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-substring-coerce.nix new file mode 100644 index 0000000000..626ae1d1be --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-substring-coerce.nix @@ -0,0 +1,5 @@ +# builtins.substring uses string coercion internally + +builtins.substring 0 2 { + __toString = _: "4200"; +} -- cgit 1.4.1