From e94e0329429d424d79544c71c012199713d234b1 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 25 Oct 2020 16:16:56 -0400 Subject: [PATCH] argh --- src/version/cargo.rs | 1 + src/version/mod.rs | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/version/cargo.rs b/src/version/cargo.rs index c4ef009..6b09cff 100644 --- a/src/version/cargo.rs +++ b/src/version/cargo.rs @@ -47,6 +47,7 @@ mod tests { #[test] fn read() { use super::read; + let _ = pretty_env_logger::try_init(); read().unwrap().unwrap(); } } diff --git a/src/version/mod.rs b/src/version/mod.rs index 1594d94..ad05177 100644 --- a/src/version/mod.rs +++ b/src/version/mod.rs @@ -4,7 +4,13 @@ use std::{fs, path::PathBuf}; mod cargo; pub(crate) fn read(fname: PathBuf) -> Result { - let version = read_fs(fname).unwrap_or(cargo::read().unwrap().unwrap()); + let version = match read_fs(fname.clone()) { + Ok(version) => version, + Err(why) => { + log::debug!("can't read {:?}: {:?}", fname, why); + cargo::read().unwrap().unwrap() + } + }; Ok(version) } @@ -17,6 +23,7 @@ fn read_fs(fname: PathBuf) -> Result { mod tests { #[test] fn read_version() { + let _ = pretty_env_logger::try_init(); let version = super::read_fs("./testdata/VERSION".into()).unwrap(); assert_eq!(version, "0.1.0"); }