From f2c66c8e47fddd468b0b6894e7c1902b0baecc16 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 7 Nov 2018 20:05:51 -0500 Subject: no need to define my own type here didn't realize this already existed --- src/main.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 4d66a92..ed5a189 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,15 +12,12 @@ extern crate serde_json; extern crate serde_derive; mod cli; -mod error; mod exporter; mod lastfm; mod paths; mod db; -use error::Result; - -fn run(opts: cli::Options) -> Result<()> { +fn run(opts: cli::Options) -> failure::Fallible<()> { let db = db::DB::new(&paths::dbpath())?; let lastfm = lastfm::LastFMClient::new(&opts.api_key, &opts.username); let exporter = exporter::Exporter::new(&db, &lastfm); @@ -42,7 +39,7 @@ fn run(opts: cli::Options) -> Result<()> { Ok(()) } -fn program_name() -> Result { +fn program_name() -> failure::Fallible { let program = std::env::args() .next() .ok_or_else(|| format_err!("no program name found"))?; -- cgit v1.2.3-54-g00ecf