Better error reporting for config and other params (#957)

This prints an extended error message, explaining to the user what
params must be removed.

Fixes #938
This commit is contained in:
Yuri Astrakhan 2023-10-21 21:37:14 -04:00 committed by GitHub
parent 2053f8067c
commit 2e7a179aaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions

View File

@ -55,7 +55,7 @@ impl Args {
warn!("The WATCH_MODE env variable is no longer supported, and will be ignored"); warn!("The WATCH_MODE env variable is no longer supported, and will be ignored");
} }
if self.meta.config.is_some() && !self.meta.connection.is_empty() { if self.meta.config.is_some() && !self.meta.connection.is_empty() {
return Err(Error::ConfigAndConnectionsError); return Err(Error::ConfigAndConnectionsError(self.meta.connection));
} }
self.srv.merge_into_config(&mut config.srv); self.srv.merge_into_config(&mut config.srv);
@ -174,7 +174,7 @@ mod tests {
let env = FauxEnv::default(); let env = FauxEnv::default();
let mut config = Config::default(); let mut config = Config::default();
let err = args.merge_into_config(&mut config, &env).unwrap_err(); let err = args.merge_into_config(&mut config, &env).unwrap_err();
assert!(matches!(err, crate::Error::ConfigAndConnectionsError)); assert!(matches!(err, crate::Error::ConfigAndConnectionsError(..)));
} }
#[test] #[test]

View File

@ -1,3 +1,4 @@
use std::fmt::Write;
use std::io; use std::io;
use std::path::PathBuf; use std::path::PathBuf;
@ -7,10 +8,30 @@ use crate::sprites::SpriteError;
pub type Result<T> = std::result::Result<T, Error>; pub type Result<T> = std::result::Result<T, Error>;
fn elide_vec(vec: &[String], max_items: usize, max_len: usize) -> String {
let mut s = String::new();
for (i, v) in vec.iter().enumerate() {
if i > max_items {
let _ = write!(s, " and {} more", vec.len() - i);
break;
}
if i > 0 {
s.push(' ');
}
if v.len() > max_len {
s.push_str(&v[..max_len]);
s.push('…');
} else {
s.push_str(v);
}
}
s
}
#[derive(thiserror::Error, Debug)] #[derive(thiserror::Error, Debug)]
pub enum Error { pub enum Error {
#[error("The --config and the connection parameters cannot be used together")] #[error("The --config and the connection parameters cannot be used together. Please remove unsupported parameters '{}'", elide_vec(.0, 3, 15))]
ConfigAndConnectionsError, ConfigAndConnectionsError(Vec<String>),
#[error("Unable to bind to {1}: {0}")] #[error("Unable to bind to {1}: {0}")]
BindingError(io::Error, String), BindingError(io::Error, String),