From 82b4111b7be32b8cd0082a91224aafd53bc2677f Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 7 Nov 2018 22:42:45 -0500 Subject: clean up one more use of expect --- src/cmd/sync.rs | 2 +- src/paths.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cmd/sync.rs b/src/cmd/sync.rs index 985b221..00fd35d 100644 --- a/src/cmd/sync.rs +++ b/src/cmd/sync.rs @@ -6,7 +6,7 @@ use paths; use failure; pub fn run(opts: &cli::Options) -> failure::Fallible<()> { - let db = db::DB::new(&paths::dbpath())?; + let db = db::DB::new(&paths::dbpath()?)?; let lastfm = lastfm::LastFMClient::new( opts.api_key.as_ref().unwrap(), opts.username.as_ref().unwrap() diff --git a/src/paths.rs b/src/paths.rs index 2322cea..b412045 100644 --- a/src/paths.rs +++ b/src/paths.rs @@ -1,8 +1,8 @@ use directories::ProjectDirs; -pub fn dbpath() -> std::path::PathBuf { - ProjectDirs::from("", "", "lastfm-query") - .expect("coudln't determine data directory") +pub fn dbpath() -> failure::Fallible { + Ok(ProjectDirs::from("", "", "lastfm-query") + .ok_or_else(|| failure::err_msg("couldn't determine data directory"))? .data_dir() - .join("tracks.sqlite") + .join("tracks.sqlite")) } -- cgit v1.2.3