From 66a35de3b67dd441185b7badaf559c8a25ab9967 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sun, 9 Oct 2022 13:09:11 -0400 Subject: feat(tvix/eval): Implement builtins.concatStringsSep Change-Id: I6e46bcdbf3b5258b60edb017709fee577eb8ec74 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6907 Reviewed-by: tazjin Tested-by: BuildkiteCI --- tvix/eval/src/value/mod.rs | 6 ++++++ tvix/eval/src/value/string.rs | 15 +++++++++++++++ 2 files changed, 21 insertions(+) (limited to 'tvix/eval/src/value') diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs index 0f3b9cbbf4a2..0e9d013fdf61 100644 --- a/tvix/eval/src/value/mod.rs +++ b/tvix/eval/src/value/mod.rs @@ -377,6 +377,12 @@ impl From<&str> for Value { } } +impl From for Value { + fn from(val: String) -> Self { + Self::String(val.into()) + } +} + fn type_error(expected: &'static str, actual: &Value) -> ErrorKind { ErrorKind::TypeError { expected, diff --git a/tvix/eval/src/value/string.rs b/tvix/eval/src/value/string.rs index bfbaa815db99..c21f2c4e8395 100644 --- a/tvix/eval/src/value/string.rs +++ b/tvix/eval/src/value/string.rs @@ -2,6 +2,7 @@ //! backing implementations. use smol_str::SmolStr; use std::hash::Hash; +use std::ops::Deref; use std::{borrow::Cow, fmt::Display, str::Chars}; #[derive(Clone, Debug)] @@ -178,6 +179,20 @@ impl Display for NixString { } } +impl AsRef for NixString { + fn as_ref(&self) -> &str { + self.as_str() + } +} + +impl Deref for NixString { + type Target = str; + + fn deref(&self) -> &Self::Target { + self.as_str() + } +} + #[cfg(test)] mod tests { use super::*; -- cgit 1.4.1