diff options
Diffstat (limited to 'src/file/format')
| -rw-r--r-- | src/file/format/ini.rs | 15 | ||||
| -rw-r--r-- | src/file/format/json.rs | 16 |
2 files changed, 12 insertions, 19 deletions
diff --git a/src/file/format/ini.rs b/src/file/format/ini.rs index e5e5950..e5a109f 100644 --- a/src/file/format/ini.rs +++ b/src/file/format/ini.rs @@ -15,22 +15,13 @@ pub fn parse( Some(ref sec) => { let mut sec_map: HashMap<String, Value> = HashMap::new(); for (k, v) in prop.iter() { - sec_map.insert( - k.clone(), - Value::new(uri, ValueKind::String(v.clone())), - ); + sec_map.insert(k.clone(), Value::new(uri, ValueKind::String(v.clone()))); } - map.insert( - sec.clone(), - Value::new(uri, ValueKind::Table(sec_map)), - ); + map.insert(sec.clone(), Value::new(uri, ValueKind::Table(sec_map))); } None => { for (k, v) in prop.iter() { - map.insert( - k.clone(), - Value::new(uri, ValueKind::String(v.clone())), - ); + map.insert(k.clone(), Value::new(uri, ValueKind::String(v.clone()))); } } } diff --git a/src/file/format/json.rs b/src/file/format/json.rs index 0d15070..0ff2beb 100644 --- a/src/file/format/json.rs +++ b/src/file/format/json.rs @@ -22,13 +22,15 @@ fn from_json_value(uri: Option<&String>, value: &serde_json::Value) -> Value { match *value { serde_json::Value::String(ref value) => Value::new(uri, ValueKind::String(value.clone())), - serde_json::Value::Number(ref value) => if let Some(value) = value.as_i64() { - Value::new(uri, ValueKind::Integer(value)) - } else if let Some(value) = value.as_f64() { - Value::new(uri, ValueKind::Float(value)) - } else { - unreachable!(); - }, + serde_json::Value::Number(ref value) => { + if let Some(value) = value.as_i64() { + Value::new(uri, ValueKind::Integer(value)) + } else if let Some(value) = value.as_f64() { + Value::new(uri, ValueKind::Float(value)) + } else { + unreachable!(); + } + } serde_json::Value::Bool(value) => Value::new(uri, ValueKind::Boolean(value)), |