From 0f1c742857b43565623932a5aa469ded2f1ad6dd Mon Sep 17 00:00:00 2001 From: Joe Wilm Date: Tue, 27 Dec 2016 22:47:25 -0500 Subject: Minor cleanup in main() --- src/main.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main.rs b/src/main.rs index aceb9659..fb58b461 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,9 +33,8 @@ use alacritty::tty::{self, process_should_exit}; fn main() { // Load configuration - let config = match Config::load() { - // Error loading config - Err(err) => match err { + let config = Config::load().unwrap_or_else(|err| { + match err { // Use default config when not found config::Error::NotFound => { err_println!("Config file not found; using defaults"); @@ -45,11 +44,8 @@ fn main() { // If there's a problem with the config file, print an error // and exit. _ => die!("{}", err), - }, - - // Successfully loaded config from file - Ok(config) => config - }; + } + }); // Load command line options let options = cli::Options::load(); -- cgit v1.2.3-54-g00ecf