summaryrefslogtreecommitdiffstats
path: root/examples/watch/src/main.rs
diff options
context:
space:
mode:
authorRyan Leckey <leckey.ryan@gmail.com>2017-07-30 13:20:36 -0700
committerRyan Leckey <leckey.ryan@gmail.com>2017-07-30 13:20:36 -0700
commit14224be23dc2f253a240b85214927d97e1160669 (patch)
tree6f5b02b26aef5cf37bb14f32b9048165b67109ce /examples/watch/src/main.rs
parent71f4b182d1e56febda64bd620ae0e0f65de333cd (diff)
Remove ConfigResult; close #36
Diffstat (limited to 'examples/watch/src/main.rs')
-rw-r--r--examples/watch/src/main.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/examples/watch/src/main.rs b/examples/watch/src/main.rs
index 70fb7ef..0976f74 100644
--- a/examples/watch/src/main.rs
+++ b/examples/watch/src/main.rs
@@ -12,10 +12,12 @@ use std::sync::mpsc::channel;
use std::time::Duration;
lazy_static! {
- static ref SETTINGS: RwLock<Config> = RwLock::new(Config::default()
- .merge(File::with_name("Settings.toml"))
- .unwrap()
- );
+ static ref SETTINGS: RwLock<Config> = RwLock::new({
+ let mut settings = Config::default();
+ settings.merge(File::with_name("Settings.toml")).unwrap();
+
+ settings
+ });
}
fn show() {