From 9fac19eacba7a7efdd7ffa389e01be243e8dd985 Mon Sep 17 00:00:00 2001 From: toast Date: Sat, 16 Mar 2024 09:47:21 +1100 Subject: [PATCH] Sync changes from Kon and remove unused crates --- Cargo.lock | 156 ----------------------------------- Cargo.toml | 3 - src/commands/uptime.rs | 4 +- src/internals/mod.rs | 1 + src/{ => internals}/utils.rs | 0 src/main.rs | 4 +- tomlfmt.toml | 18 ---- 7 files changed, 5 insertions(+), 181 deletions(-) create mode 100644 src/internals/mod.rs rename src/{ => internals}/utils.rs (100%) delete mode 100644 tomlfmt.toml diff --git a/Cargo.lock b/Cargo.lock index 82932c1..a26d4d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -446,21 +446,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -703,19 +688,6 @@ dependencies = [ "tokio-rustls 0.24.1", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "iana-time-zone" version = "0.1.58" @@ -786,12 +758,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "levenshtein" version = "1.0.5" @@ -883,24 +849,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -944,50 +892,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "openssl" -version = "0.10.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.46", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.97" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -1029,12 +933,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - [[package]] name = "poise" version = "0.6.1" @@ -1209,13 +1107,11 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", - "hyper-tls", "ipnet", "js-sys", "log", "mime", "mime_guess", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -1227,7 +1123,6 @@ dependencies = [ "sync_wrapper", "system-configuration", "tokio", - "tokio-native-tls", "tokio-rustls 0.24.1", "tokio-util", "tower-service", @@ -1261,9 +1156,6 @@ dependencies = [ "cargo_toml", "once_cell", "poise", - "reqwest", - "serde", - "serde_json", "serenity", "sysinfo", "tempfile", @@ -1367,15 +1259,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -1402,29 +1285,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "1.0.20" @@ -1791,16 +1651,6 @@ dependencies = [ "syn 2.0.46", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -2069,12 +1919,6 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4bf03e0ca70d626ecc4ba6b0763b934b6f2976e8c744088bb3c1d646fbb1ad0" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index 5ca85a8..687db28 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,9 +7,6 @@ edition = "2021" cargo_toml = "0.19.2" once_cell = "1.19.0" poise = "0.6.1" -reqwest = { version = "0.11.26", features = ["json"] } -serde = "1.0.197" -serde_json = "1.0.114" serenity = "0.12.1" sysinfo = "0.30.7" tempfile = "3.10.1" diff --git a/src/commands/uptime.rs b/src/commands/uptime.rs index 3eeb0f4..c7928eb 100644 --- a/src/commands/uptime.rs +++ b/src/commands/uptime.rs @@ -1,6 +1,6 @@ use crate::{ Error, - utils::{ + internals::utils::{ format_duration, concat_message, BOT_VERSION @@ -35,7 +35,7 @@ pub async fn uptime(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> { } let stat_msg = vec![ - format!("**{} {}**", _bot.name, &**BOT_VERSION), + format!("**{} {}**", _bot.name, BOT_VERSION.as_str()), format!(">>> System: `{}`", format_duration(sys_uptime)), format!("Process: `{}`", format_duration(proc_uptime)) ]; diff --git a/src/internals/mod.rs b/src/internals/mod.rs new file mode 100644 index 0000000..b5614dd --- /dev/null +++ b/src/internals/mod.rs @@ -0,0 +1 @@ +pub mod utils; diff --git a/src/utils.rs b/src/internals/utils.rs similarity index 100% rename from src/utils.rs rename to src/internals/utils.rs diff --git a/src/main.rs b/src/main.rs index b8a9a4d..f407ca0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ mod commands; -mod utils; +mod internals; use poise::serenity_prelude::{self as serenity}; use std::{ @@ -31,7 +31,7 @@ async fn on_ready( let message = CreateMessage::new(); let ready_embed = CreateEmbed::new() - .color(utils::EMBED_COLOR) + .color(internals::utils::EMBED_COLOR) .thumbnail(ready.user.avatar_url().unwrap_or_default()) .author(CreateEmbedAuthor::new(format!("{} is ready!", ready.user.name)).clone()); diff --git a/tomlfmt.toml b/tomlfmt.toml deleted file mode 100644 index 8bfdc2c..0000000 --- a/tomlfmt.toml +++ /dev/null @@ -1,18 +0,0 @@ -# trailing comma in arrays -always_trailing_comma = true - -# trailing comma when multi-line -multiline_trailing_comma = true - -# remove all the spacing inside the array -compact_arrays = false - -# remove all the spacing inside the object -compact_inline_tables = false - -# Windows EOF style -crlf = false - -trailing_newline = false -space_around_eq = true -allowed_blank_lines = 1