From be06387316d57eb09bd80222b00484d99cb2c89c Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 12 Jun 2024 22:01:07 -0400 Subject: [PATCH] Replace expect calls with results --- src/bot.rs | 2 +- src/main.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bot.rs b/src/bot.rs index 5132595..0f11f6d 100644 --- a/src/bot.rs +++ b/src/bot.rs @@ -133,7 +133,7 @@ impl Bot { } } - let old_config = Config::read(); + let old_config = Config::read()?; let new_config = Config { username: old_config.username, password: old_config.password, diff --git a/src/main.rs b/src/main.rs index 3a7862f..a6a04a1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,23 +16,23 @@ struct Config { } impl Config { - fn read() -> Self { - let config_path = var("CONFIG_PATH").expect("Provide CONFIG_PATH environment variable"); - let config_file_content = read_to_string(config_path).expect("Failed to read config file"); + fn read() -> Result { + let config_path = var("CONFIG_PATH").map_err(|error| error.to_string())?; + let config_file_content = read_to_string(config_path).map_err(|error| error.to_string())?; - toml::from_str::(&config_file_content).expect("Failed to deserialize config file.") + toml::from_str::(&config_file_content).map_err(|error| error.to_string()) } fn write(&self) -> Result<(), String> { - let config_path = var("CONFIG_PATH").expect("Provide CONFIG_PATH environment variable"); - let config_string = toml::to_string(self).expect("Failed to serialize Config"); + let config_path = var("CONFIG_PATH").map_err(|error| error.to_string())?; + let config_string = toml::to_string(self).map_err(|error| error.to_string())?; write(config_path, config_string).map_err(|error| error.to_string()) } } fn main() { - let config = Config::read(); + let config = Config::read().unwrap(); let mut bot = Bot::new(&config.username, &config.password, config.admin_list) .expect("Failed to create bot");