From c1bcf6ec5537bfd0fb3f1ee8d93a32aa15031cff Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Sat, 28 Jan 2017 22:07:13 -0800 Subject: Propagate Cow into Source --- src/config.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/config.rs') diff --git a/src/config.rs b/src/config.rs index a1a36cb..b88b812 100644 --- a/src/config.rs +++ b/src/config.rs @@ -81,23 +81,23 @@ impl<'a> ConfigStore<'a> { } } - fn get(&self, key: &str) -> Option { + fn get(&self, key: &str) -> Option> { if let ConfigStore::Mutable { ref overrides, ref sources, ref defaults } = *self { // Check explicit override if let Some(value) = overrides.get(key) { - return Some(value.clone()); + return Some(Cow::Borrowed(value)); } // Check sources for source in &mut sources.iter().rev() { if let Some(value) = source.get(key) { - return Some(value); + return Some(value) } } // Check explicit defaults if let Some(value) = defaults.get(key) { - return Some(value.clone()); + return Some(Cow::Borrowed(value)); } } @@ -154,7 +154,7 @@ impl<'a> Config<'a> { } pub fn get(&self, key: &str) -> Option> { - self.store.get(key).map(Cow::Owned) + self.store.get(key) } pub fn get_str(&'a self, key: &str) -> Option> { -- cgit v1.2.3