about summary refs log tree commit diff
path: root/users/Profpatsch/netencode/netencode.rs
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2021-02-13T22·13+0100
committerProfpatsch <mail@profpatsch.de>2021-04-23T20·45+0000
commit9d7c3ee877837070c51760cb621bc409c6d0f6a7 (patch)
tree3d875423c597b950cc8ada8fa80077d8070dcfdb /users/Profpatsch/netencode/netencode.rs
parent5156da542bac99aa2e625bc4c1033d2017aa5c54 (diff)
feat(users/Profpatsch/netencode): add env-splice-record r/2543
It’s the inverse of record-splice-env! It sucks up the environment and
prints it as a netencode dict! Only the utf-8 clean parts at least.

Change-Id: I96c19fc5ea3a67a23e238f15f4d0fa783081859c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2527
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
Diffstat (limited to 'users/Profpatsch/netencode/netencode.rs')
-rw-r--r--users/Profpatsch/netencode/netencode.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/users/Profpatsch/netencode/netencode.rs b/users/Profpatsch/netencode/netencode.rs
index 249cc33ed1c0..ab10af307c6f 100644
--- a/users/Profpatsch/netencode/netencode.rs
+++ b/users/Profpatsch/netencode/netencode.rs
@@ -26,6 +26,7 @@ pub enum T {
     Binary(Vec<u8>),
     // Tags
     // TODO: make into &str
+    // TODO: rename to Tag
     Sum(Tag<String, T>),
     // TODO: make into &str
     Record(HashMap<String, T>),
@@ -81,9 +82,10 @@ pub enum U<'a> {
     // Text
     Text(&'a str),
     Binary(&'a [u8]),
-    // Tags
     // TODO: the U-recursion we do here means we can’t be breadth-lazy anymore
     // like we originally planned; maybe we want to go `U<'a>` → `&'a [u8]` again?
+    // Tags
+    // TODO: rename to Tag
     Sum(Tag<&'a str, U<'a>>),
     Record(HashMap<&'a str, U<'a>>),
     List(Vec<U<'a>>),
@@ -195,7 +197,7 @@ pub fn u_from_stdin_or_die_user_error<'a>(prog_name: &'_ str, stdin_buf: &'a mut
     let u = match parse::u_u(stdin_buf) {
         Ok((rest, u)) => match rest {
             b"" => u,
-            _ => exec_helpers::die_user_error(prog_name, format!("stdin contained some soup after netencode value: {:?}", rest))
+            _ => exec_helpers::die_user_error(prog_name, format!("stdin contained some soup after netencode value: {:?}", String::from_utf8_lossy(rest)))
         },
         Err(err) => exec_helpers::die_user_error(prog_name, format!("unable to parse netencode from stdin: {:?}", err))
     };