maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(users/Profpatsch/arglib): use exec_helpers for rust

Browse source 
Change-Id: I3056385eb11e45ae13456f4c47052651ba5fb62f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2496
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
This commit is contained in:
Profpatsch 2021-02-08 03:23:53 +01:00
parent 9fe1db6193
commit 60b79b2d9d
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
users/Profpatsch/arglib/default.nix
View file

@ -5,28 +5,30 @@ let
rust = depot.users.Profpatsch.writers.rustSimpleLib {
name = "arglib-netencode";
dependencies = [
depot.users.Profpatsch.execline.exec-helpers
depot.users.Profpatsch.netencode.netencode-rs
];
} ''
extern crate netencode;
extern crate exec_helpers;
use netencode::{T};
use std::os::unix::ffi::OsStrExt;
pub fn arglib_netencode(env: Option<&std::ffi::OsStr>) -> Result<T, String> {
pub fn arglib_netencode(prog_name: &str, env: Option<&std::ffi::OsStr>) -> T {
let env = match env {
None => std::ffi::OsStr::from_bytes("ARGLIB_NETENCODE".as_bytes()),
Some(a) => a
};
match std::env::var_os(env) {
None => Err(format!("could not read args, envvar {} not set", env.to_string_lossy())),
None => exec_helpers::die_user_error(prog_name, format!("could not read args, envvar {} not set", env.to_string_lossy())),
// TODO: good error handling for the different parser errors
Some(soup) => match netencode::parse::t_t(soup.as_bytes()) {
Ok((remainder, t)) => match remainder.is_empty() {
true => Ok(t),
false => Err(format!("there was some unparsed bytes remaining: {:?}", remainder))
true => t,
false => exec_helpers::die_environment_problem(prog_name, format!("arglib: there was some unparsed bytes remaining: {:?}", remainder))
},
Err(err) => Err(format!("parsing error: {:?}", err))
Err(err) => exec_helpers::die_environment_problem(prog_name, format!("arglib parsing error: {:?}", err))
}
}
}