summaryrefslogtreecommitdiffstats
path: root/src/config.rs
diff options
context:
space:
mode:
authorRyan Leckey <leckey.ryan@gmail.com>2017-02-07 17:17:50 -0800
committerRyan Leckey <leckey.ryan@gmail.com>2017-02-07 17:17:50 -0800
commit010b2d6759a8d21de04a86c9babf470c8ed77a6a (patch)
tree7ac02ba80fb57a5e50ef2ebe77288ee45d6bb3ab /src/config.rs
parent788a08756ab88b48c117257685ad7b93b8fab641 (diff)
:shirt:
Diffstat (limited to 'src/config.rs')
-rw-r--r--src/config.rs31
1 files changed, 12 insertions, 19 deletions
diff --git a/src/config.rs b/src/config.rs
index 6c81244..cfe5ea5 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -217,17 +217,13 @@ impl Config {
// Child ( Child ( Identifier( "x" ), "y" ), "z" )
fn path_get<'a, 'b>(&'a self, expr: path::Expression) -> Option<&'a Value> {
match expr {
- path::Expression::Identifier(text) => {
- self.cache.get(&text)
- }
+ path::Expression::Identifier(text) => self.cache.get(&text),
path::Expression::Child(expr, member) => {
match self.path_get(*expr) {
- Some(&Value::Table(ref table)) => {
- table.get(&member)
- }
+ Some(&Value::Table(ref table)) => table.get(&member),
- _ => None
+ _ => None,
}
}
@@ -247,7 +243,7 @@ impl Config {
}
}
- _ => None
+ _ => None,
}
}
}
@@ -448,11 +444,9 @@ mod test {
fn test_slice() {
let mut c = Config::new();
- c.set("values", vec![
- Value::Integer(10),
- Value::Integer(325),
- Value::Integer(12),
- ]).unwrap();
+ c.set("values",
+ vec![Value::Integer(10), Value::Integer(325), Value::Integer(12)])
+ .unwrap();
let values = c.get_slice("values").unwrap();
@@ -464,11 +458,8 @@ mod test {
fn test_slice_into() {
let mut c = Config::new();
- c.set("values", vec![
- 10,
- 325,
- 12,
- ]).unwrap();
+ c.set("values", vec![10, 325, 12])
+ .unwrap();
let values = c.get_slice("values").unwrap();
@@ -526,7 +517,9 @@ mod test {
[[databases]]
name = "test_db"
options = { trace = true }
- "#, FileFormat::Toml)).unwrap();
+ "#,
+ FileFormat::Toml))
+ .unwrap();
assert_eq!(c.get_str("redis.address").unwrap(), "localhost:6379");
assert_eq!(c.get_str("databases[0].name").unwrap(), "test_db");