From 638dc58e86ba3bbe31d50e72788c9681d414e0ae Mon Sep 17 00:00:00 2001 From: fxqnlr Date: Wed, 4 Sep 2024 12:34:42 +0200 Subject: remove allow module_name_repetition and fix it --- src/main.rs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index f388a82..a1f0c31 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,8 +4,7 @@ use modlist::{ db::{config_get_current_list, lists_get, lists_get_all_ids}, download, error::MLE, - export, get_current_list, import, list_add, list_change, list_lists, - list_remove, list_version, mod_add, mod_remove, update, AddMod, IDSelector, + export, import, mod_add, mod_remove, update, AddMod, IDSelector, List, Modloader, VersionLevel, }; @@ -184,7 +183,7 @@ async fn main() { } else { let current = match list { Some(l) => lists_get(&config, &l).unwrap(), - None => get_current_list(&config).unwrap(), + None => List::get_current_list(&config).unwrap(), }; liststack.push(current); } @@ -206,7 +205,7 @@ async fn main() { } else { let current = match list { Some(l) => lists_get(&config, &l).unwrap(), - None => get_current_list(&config).unwrap(), + None => List::get_current_list(&config).unwrap(), }; liststack.push(current); } @@ -309,16 +308,16 @@ async fn handle_list( .unwrap(), }; - list_add(&config, &id, &ver, &ml, &directory) + List::add(&config, &id, &ver, &ml, &directory) } - ListCommands::Remove { id } => list_remove(&config, &id), - ListCommands::List => list_lists(&config), - ListCommands::Change { id } => list_change(&config, &id), + ListCommands::Remove { id } => List::remove(&config, &id), + ListCommands::List => List::list(&config), + ListCommands::Change { id } => List::change(&config, &id), ListCommands::Version { id, version, download, remove, - } => list_version(&config, &id, version, download, remove).await, + } => List::version(&config, &id, version, download, remove).await, } } -- cgit v1.2.3