summaryrefslogtreecommitdiffstats
path: root/src/config.rs
diff options
context:
space:
mode:
authorRyan Leckey <leckey.ryan@gmail.com>2017-01-26 00:12:28 -0800
committerRyan Leckey <leckey.ryan@gmail.com>2017-01-26 00:12:28 -0800
commite1cfdde75bc287c09ad8ceec09181eeef4aa3a41 (patch)
treeb256ea9a4418ee60de2d607cde19f581aa24b691 /src/config.rs
parenta6fb2f92dc8d53660c1d2d066f146ef261052330 (diff)
:green_heart:
Diffstat (limited to 'src/config.rs')
-rw-r--r--src/config.rs12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/config.rs b/src/config.rs
index d0be21f..22bf2c4 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -98,11 +98,7 @@ impl Config {
}
pub fn get_str<'a>(&'a mut self, key: &str) -> Option<Cow<'a, str>> {
- if let Some(value) = self.get(key) {
- value.as_str()
- } else {
- None
- }
+ self.get(key).and_then(Value::as_str)
}
pub fn get_int(&mut self, key: &str) -> Option<i64> {
@@ -304,16 +300,16 @@ mod test {
c.set("key_10", 0.0);
c.set("key_11", "asga");
- assert_eq!(c.get_bool("key_1"), Some(false));
+ assert_eq!(c.get_bool("key_1"), None);
assert_eq!(c.get_bool("key_2"), Some(true));
assert_eq!(c.get_bool("key_3"), Some(false));
assert_eq!(c.get_bool("key_4"), Some(true));
- assert_eq!(c.get_bool("key_5"), Some(false));
+ assert_eq!(c.get_bool("key_5"), None);
assert_eq!(c.get_bool("key_6"), Some(true));
assert_eq!(c.get_bool("key_7"), Some(false));
assert_eq!(c.get_bool("key_8"), Some(true));
assert_eq!(c.get_bool("key_9"), Some(true));
assert_eq!(c.get_bool("key_10"), Some(false));
- assert_eq!(c.get_bool("key_11"), Some(false));
+ assert_eq!(c.get_bool("key_11"), None);
}
}