summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFederico Pasqua <federico.pasqua.96@gmail.com>2020-03-14 16:36:06 +0100
committerFederico Pasqua <federico.pasqua.96@gmail.com>2020-03-14 16:36:06 +0100
commite84a39949c0c1625c1886b8f718b8165c7a8e831 (patch)
tree5e6468c43f2f06fca2a338839a3d7a80e4d67d49
parent57fb2610ad274dff1d2f2e4d43dfce05ca9c4835 (diff)
Clippy fix for examples
-rw-r--r--examples/global/src/main.rs2
-rw-r--r--examples/hierarchical-env/src/settings.rs2
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<Config> = RwLock::new(Config::default());
}
-fn try_main() -> Result<(), Box<Error>> {
+fn try_main() -> Result<(), Box<dyn Error>> {
// 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