Update and remove lifetime

This commit is contained in:
Lucy Bladen 2022-02-16 15:39:24 +00:00
parent 0dbe3272a9
commit 73abd7d5ca
Signed by untrusted user who does not match committer: xyon
GPG Key ID: DD18155D6B18078D
2 changed files with 8 additions and 8 deletions

View File

@ -11,16 +11,16 @@ built = { version = "0.5.1", features = ["git2", "chrono"] }
[dependencies] [dependencies]
built = { version = "0.5.1", features = ["git2", "chrono"] } built = { version = "0.5.1", features = ["git2", "chrono"] }
clap = "2.33.3" clap = "3.0.14"
diesel = { version = "1.4.8", features = ["sqlite", "r2d2", "chrono"] } diesel = { version = "1.4.8", features = ["sqlite", "r2d2", "chrono"] }
diesel_migrations = "1.4.0" diesel_migrations = "1.4.0"
env_logger = "0.9.0" env_logger = "0.9.0"
log = "0.4.14" log = "0.4.14"
r2d2 = "0.8.9" r2d2 = "0.8.9"
rand = "0.8.4" rand = "0.8.5"
regex = "1.5.4" regex = "1.5.4"
reqwest = "0.11.6" reqwest = "0.11.9"
serde = "1.0.130" serde = "1.0.136"
serde_json = "1.0.69" serde_json = "1.0.79"
serenity = { version = "0.10", features = [ "collector", "unstable_discord_api" ] } serenity = { version = "0.10.10", features = [ "collector", "unstable_discord_api" ] }
tokio = { version = "1.13.0", features = ["sync", "macros", "rt-multi-thread"] } tokio = { version = "1.16.1", features = ["sync", "macros", "rt-multi-thread"] }

View File

@ -61,7 +61,7 @@ impl TypeMapKey for ManifoldConfig {
#[commands(ping, set_config, get_config, version, set_activity, get_environment)] #[commands(ping, set_config, get_config, version, set_activity, get_environment)]
struct Core; struct Core;
pub async fn prepare_client<T: 'static + EventHandler>(arguments: ArgMatches<'_>, mut framework: StandardFramework, event_handler: T) -> ManifoldResult<Client> { pub async fn prepare_client<T: 'static + EventHandler>(arguments: ArgMatches, mut framework: StandardFramework, event_handler: T) -> ManifoldResult<Client> {
let bot_environment = arguments.value_of("environment").unwrap_or("Production").to_string(); let bot_environment = arguments.value_of("environment").unwrap_or("Production").to_string();
let config_file = format!("config/{}", arguments.value_of("config-file").unwrap_or("manifold.json")); let config_file = format!("config/{}", arguments.value_of("config-file").unwrap_or("manifold.json"));
if arguments.occurrences_of("make-config") > 0 { if arguments.occurrences_of("make-config") > 0 {