matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix libimagref for toml 0.4

Browse source
This commit is contained in:
Matthias Beyer 2017-05-03 20:27:21 +02:00
parent c1596d9c61
commit da01875e9f
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libimagref/src/error.rs
View file

@ -24,6 +24,7 @@ generate_error_module!(
IOError => "IO Error", IOError => "IO Error",
UTF8Error => "UTF8 Error", UTF8Error => "UTF8 Error",
StoreIdError => "Error with storeid", StoreIdError => "Error with storeid",
HeaderTomlError => "Error while working with TOML Header",
HeaderTypeError => "Header type error", HeaderTypeError => "Header type error",
HeaderFieldMissingError => "Header field missing error", HeaderFieldMissingError => "Header field missing error",
HeaderFieldWriteError => "Header field cannot be written", HeaderFieldWriteError => "Header field cannot be written",

15
libimagref/src/flags.rs
View file

@ -37,11 +37,16 @@ impl RefFlags {
/// It assumes that this is a Map with Key = <name of the setting> and Value = boolean. /// It assumes that this is a Map with Key = <name of the setting> and Value = boolean.
pub fn read(v: &Value) -> Result<RefFlags> { pub fn read(v: &Value) -> Result<RefFlags> {
fn get_field(v: &Value, key: &str) -> Result<bool> { fn get_field(v: &Value, key: &str) -> Result<bool> {
match v.lookup(key) { use libimagstore::toml_ext::TomlValueExt;
Some(&Value::Boolean(b)) => Ok(b), use error::MapErrInto;
Some(_) => Err(REK::HeaderTypeError.into()),
None => Err(REK::HeaderFieldMissingError.into()), v.read(key)
} .map_err_into(REK::HeaderTomlError)
.and_then(|toml| match toml {
Some(Value::Boolean(b)) => Ok(b),
Some(_) => Err(REK::HeaderTypeError.into()),
None => Err(REK::HeaderFieldMissingError.into()),
})
} }
Ok(RefFlags { Ok(RefFlags {