diff options
| -rw-r--r-- | tvix/eval/src/builtins/mod.rs | 2 | ||||
| -rw-r--r-- | tvix/eval/src/value/string.rs | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index f9302deab8..ead916377f 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -951,7 +951,7 @@ mod pure_builtins { cmp::min(beg + (len as usize), x.as_str().len()) }; - Ok(Value::String(x.as_str()[beg..end].into())) + Ok(Value::String(x.as_bytes()[beg..end].try_into()?)) } #[builtin("tail")] diff --git a/tvix/eval/src/value/string.rs b/tvix/eval/src/value/string.rs index 8a69e060c6..314b21d668 100644 --- a/tvix/eval/src/value/string.rs +++ b/tvix/eval/src/value/string.rs @@ -8,6 +8,7 @@ use std::ffi::OsStr; use std::hash::Hash; use std::ops::Deref; use std::path::Path; +use std::str::{self, Utf8Error}; use std::{borrow::Cow, fmt::Display, str::Chars}; use serde::de::{Deserializer, Visitor}; @@ -37,6 +38,14 @@ impl Ord for NixString { } } +impl TryFrom<&[u8]> for NixString { + type Error = Utf8Error; + + fn try_from(value: &[u8]) -> Result<Self, Self::Error> { + Ok(Self(Box::from(str::from_utf8(value)?))) + } +} + impl From<&str> for NixString { fn from(s: &str) -> Self { NixString(Box::from(s)) |