diff options
Diffstat (limited to 'users')
| -rw-r--r-- | users/Profpatsch/arglib/default.nix | 12 | ||||
| -rw-r--r-- | users/Profpatsch/netencode/netencode-mustache.rs | 2 | ||||
| -rw-r--r-- | users/Profpatsch/read-http.rs | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/users/Profpatsch/arglib/default.nix b/users/Profpatsch/arglib/default.nix index 4f9f8e4cae79..4da2e196db9c 100644 --- a/users/Profpatsch/arglib/default.nix +++ b/users/Profpatsch/arglib/default.nix @@ -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)) } } } diff --git a/users/Profpatsch/netencode/netencode-mustache.rs b/users/Profpatsch/netencode/netencode-mustache.rs index 5c7242ed0869..ee7bafed2250 100644 --- a/users/Profpatsch/netencode/netencode-mustache.rs +++ b/users/Profpatsch/netencode/netencode-mustache.rs @@ -37,7 +37,7 @@ fn netencode_to_mustache_data_dwim(t: T) -> Data { pub fn from_stdin() -> () { let data = netencode_to_mustache_data_dwim( - arglib_netencode::arglib_netencode(Some(std::ffi::OsStr::new("TEMPLATE_DATA"))).unwrap() + arglib_netencode::arglib_netencode("netencode-mustache", Some(std::ffi::OsStr::new("TEMPLATE_DATA"))) ); let mut stdin = String::new(); std::io::stdin().read_to_string(&mut stdin).unwrap(); diff --git a/users/Profpatsch/read-http.rs b/users/Profpatsch/read-http.rs index becd92b816b0..0c168a733831 100644 --- a/users/Profpatsch/read-http.rs +++ b/users/Profpatsch/read-http.rs @@ -21,14 +21,14 @@ enum What { // The keys are text, but can be lists of text iff headers appear multiple times, so beware. fn main() -> std::io::Result<()> { - let what : What = match arglib_netencode::arglib_netencode(None).unwrap() { + let what : What = match arglib_netencode::arglib_netencode("read-http", None) { T::Record(rec) => match rec.get("what") { Some(T::Text(t)) => match t.as_str() { "request" => What::Request, "response" => What::Response, - _ => die_user_error("read-http arglib", "`what` should be either t:request or t:response"), + _ => die_user_error("read-http", "`what` should be either t:request or t:response"), }, - Some(o) => die_user_error("read-http arglib", format!("expected a record of text, got {:#?}", o)), + Some(o) => die_user_error("read-http", format!("expected a record of text, got {:#?}", o)), None => { eprintln!("read-http arglib: no `what` given, defaulting to Response"); What::Response |