about summary refs log tree commit diff
path: root/tvix/eval/src/value
diff options
context:
space:
mode:
authorGriffin Smith <root@gws.fyi>2022-10-09T17·09-0400
committergrfn <grfn@gws.fyi>2022-10-10T20·23+0000
commit66a35de3b67dd441185b7badaf559c8a25ab9967 (patch)
tree4ca9d3d07252e679f2d22293eda5c229e74b9d24 /tvix/eval/src/value
parent41ddc37725a59b4af0f7043a7fd66b3fe48f935d (diff)
feat(tvix/eval): Implement builtins.concatStringsSep r/5084
Change-Id: I6e46bcdbf3b5258b60edb017709fee577eb8ec74
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6907
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/value')
-rw-r--r--tvix/eval/src/value/mod.rs6
-rw-r--r--tvix/eval/src/value/string.rs15
2 files changed, 21 insertions, 0 deletions
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<String> 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<str> 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::*;