From e84a39949c0c1625c1886b8f718b8165c7a8e831 Mon Sep 17 00:00:00 2001 From: Federico Pasqua Date: Sat, 14 Mar 2020 16:36:06 +0100 Subject: Clippy fix for examples --- examples/global/src/main.rs | 2 +- examples/hierarchical-env/src/settings.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/global/src/main.rs b/examples/global/src/main.rs index 4fe0864..8e0e068 100644 --- a/examples/global/src/main.rs +++ b/examples/global/src/main.rs @@ -11,7 +11,7 @@ lazy_static! { static ref SETTINGS: RwLock = RwLock::new(Config::default()); } -fn try_main() -> Result<(), Box> { +fn try_main() -> Result<(), Box> { // Set property SETTINGS.write()?.set("property", 42)?; diff --git a/examples/hierarchical-env/src/settings.rs b/examples/hierarchical-env/src/settings.rs index c908f46..ad23163 100644 --- a/examples/hierarchical-env/src/settings.rs +++ b/examples/hierarchical-env/src/settings.rs @@ -46,7 +46,7 @@ impl Settings { // Add in the current environment file // Default to 'development' env // Note that this file is _optional_ - let env = env::var("RUN_MODE").unwrap_or("development".into()); + let env = env::var("RUN_MODE").unwrap_or_else(|_| "development".into()); s.merge(File::with_name(&format!("config/{}", env)).required(false))?; // Add in a local configuration file -- cgit v1.2.3