squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge pull request #797 from kamalmarhubi/config-expect

Browse source 
config: Make panic messages more useful
This commit is contained in:
Marcus Klaas de Vries 2016-02-03 06:08:34 +01:00
commit e2c8c1cab5
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/config.rs
View file

@ -218,12 +218,12 @@ macro_rules! create_config {
} }
pub fn from_toml(toml: &str) -> Config { pub fn from_toml(toml: &str) -> Config {
let parsed = toml.parse().unwrap(); let parsed = toml.parse().expect("Could not parse TOML");
let parsed_config:ParsedConfig = match toml::decode(parsed) { let parsed_config:ParsedConfig = match toml::decode(parsed) {
Some(decoded) => decoded, Some(decoded) => decoded,
None => { None => {
println!("Decoding config file failed. Config:\n{}", toml); println!("Decoding config file failed. Config:\n{}", toml);
let parsed: toml::Value = toml.parse().unwrap(); let parsed: toml::Value = toml.parse().expect("Could not parse TOML");
println!("\n\nParsed:\n{:?}", parsed); println!("\n\nParsed:\n{:?}", parsed);
panic!(); panic!();
} }
@ -235,10 +235,14 @@ macro_rules! create_config {
match key { match key {
$( $(
stringify!($i) => { stringify!($i) => {
self.$i = val.parse::<$ty>().unwrap(); self.$i = val.parse::<$ty>()
.expect(&format!("Failed to parse override for {} (\"{}\") as a {}",
stringify!($i),
val,
stringify!($ty)));
} }
)+ )+
_ => panic!("Bad config key!") _ => panic!("Unknown config key in override: {}", key)
} }
} }