summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.rs2
-rw-r--r--src/app.rs3
2 files changed, 2 insertions, 3 deletions
diff --git a/build.rs b/build.rs
index b7933a3..f5f04fd 100644
--- a/build.rs
+++ b/build.rs
@@ -27,7 +27,7 @@ fn main() {
}
}
- let var = std::env::var_os("SHELL_COMPLETIONS_DIR").or(std::env::var_os("OUT_DIR"));
+ let var = std::env::var_os("SHELL_COMPLETIONS_DIR").or_else(|| std::env::var_os("OUT_DIR"));
let outdir = match var {
None => return,
Some(outdir) => outdir,
diff --git a/src/app.rs b/src/app.rs
index d67e713..af906c8 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -220,9 +220,8 @@ pub fn build() -> App<'static, 'static> {
}
fn validate_date_argument(arg: String) -> Result<(), String> {
- use std::error::Error;
if arg.starts_with('+') {
- validate_time_format(&arg).map_err(|err| err.description().to_string())
+ validate_time_format(&arg).map_err(|err| err.to_string())
} else if &arg == "date" || &arg == "relative" {
Result::Ok(())
} else {