From 3bd8531b842c0cd45caa6994d0bd8bdadf2bca20 Mon Sep 17 00:00:00 2001 From: Torben Schweren Date: Fri, 4 Oct 2024 17:33:02 +0200 Subject: [PATCH 1/7] add: Cargo.lock file --- .gitignore | 4 - Cargo.lock | 3053 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3053 insertions(+), 4 deletions(-) create mode 100644 Cargo.lock diff --git a/.gitignore b/.gitignore index 196e176..a3040a7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,6 @@ debug/ target/ -# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries -# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html -Cargo.lock - # These are backup files generated by rustfmt **/*.rs.bk diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..908265d --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,3053 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytecount" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", +] + +[[package]] +name = "cc" +version = "1.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "windows-targets 0.52.6", +] + +[[package]] +name = "colored" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" +dependencies = [ + "is-terminal", + "lazy_static", + "winapi", +] + +[[package]] +name = "command_attr" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88da8d7e9fe6f30d8e3fcf72d0f84102b49de70fece952633e8439e89bdc7631" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", + "serde", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fern" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +dependencies = [ + "chrono", + "colored", + "log", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "flate2" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "halfbrown" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" +dependencies = [ + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[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.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", +] + +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "lexical-core" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0431c65b318a590c1de6b8fd6e72798c92291d27762d94c9e6c37ed7a73d8458" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb17a4bdb9b418051aa59d41d65b1c9be5affab314a872e5ad7f06231fb3b4e0" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5df98f4a4ab53bf8b175b363a34c7af608fe31f93cc1fb1bf07130622ca4ef61" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85314db53332e5c192b6bca611fb10c114a80d1b831ddac0af1e9be1b9232ca0" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e7c3ad4e37db81c1cbe7cf34610340adc09c322871972f74877a712abc6c809" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb89e9f6958b83258afa3deed90b5de9ef68eef090ad5086c791cd2345610162" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "serde", +] + +[[package]] +name = "lum" +version = "0.2.1" +dependencies = [ + "dirs", + "downcast-rs", + "fern", + "humantime", + "log", + "serde", + "serde_json", + "serenity", + "sqlx", + "thiserror", + "tokio", + "uuid", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "mini-moka" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803" +dependencies = [ + "crossbeam-channel", + "crossbeam-utils", + "dashmap", + "skeptic", + "smallvec", + "tagptr", + "triomphe", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "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.79", +] + +[[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.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pulldown-cmark" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags 2.6.0", + "memchr", + "unicase", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "serde", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cow" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7bbbec7196bfde255ab54b65e34087c0849629280028238e67ee25d6a4b7da" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serenity" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "880a04106592d0a8f5bdacb1d935889bfbccb4a14f7074984d9cd857235d34ac" +dependencies = [ + "arrayvec", + "async-trait", + "base64 0.22.1", + "bitflags 2.6.0", + "bytes", + "chrono", + "command_attr", + "dashmap", + "ed25519-dalek", + "flate2", + "futures", + "fxhash", + "levenshtein", + "mime_guess", + "mini-moka", + "parking_lot", + "percent-encoding", + "reqwest", + "secrecy", + "serde", + "serde_cow", + "serde_json", + "simd-json", + "static_assertions", + "time", + "tokio", + "tokio-tungstenite", + "tracing", + "typemap_rev", + "typesize", + "url", + "uwl", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-json" +version = "0.13.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0228a564470f81724e30996bbc2b171713b37b15254a6440c7e2d5449b95691" +dependencies = [ + "getrandom", + "halfbrown", + "lexical-core", + "ref-cast", + "serde", + "serde_json", + "simdutf8", + "value-trait", +] + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + +[[package]] +name = "skeptic" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlformat" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" +dependencies = [ + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" +dependencies = [ + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.14.5", + "hashlink", + "hex", + "indexmap", + "log", + "memchr", + "native-tls", + "once_cell", + "paste", + "percent-encoding", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "sqlx-macros" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 2.0.79", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 2.0.79", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.6.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.6.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "serde_urlencoded", + "sqlx-core", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[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-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "native-tls", + "tokio", + "tokio-native-tls", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "triomphe" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "native-tls", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typemap_rev" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74b08b0c1257381af16a5c3605254d529d3e7e109f3c62befc5d168968192998" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "typesize" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dece5c06268af6a9ff4541788601e560a4284ffebfb357f713d676f13b964db" +dependencies = [ + "chrono", + "dashmap", + "halfbrown", + "hashbrown 0.14.5", + "mini-moka", + "parking_lot", + "secrecy", + "serde_json", + "simd-json", + "time", + "typesize-derive", + "url", +] + +[[package]] +name = "typesize-derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905e88c2a4cc27686bd57e495121d451f027e441388a67f773be729ad4be1ea8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "rand", + "uuid-macro-internal", +] + +[[package]] +name = "uuid-macro-internal" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "uwl" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4bf03e0ca70d626ecc4ba6b0763b934b6f2976e8c744088bb3c1d646fbb1ad0" + +[[package]] +name = "value-trait" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" +dependencies = [ + "float-cmp", + "halfbrown", + "itoa", + "ryu", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.79", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "wasm-streams" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "whoami" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" +dependencies = [ + "redox_syscall", + "wasite", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" From dd4452fc88c633a026b5b77059bd998d14435581 Mon Sep 17 00:00:00 2001 From: Torben Schweren Date: Fri, 4 Oct 2024 19:14:41 +0200 Subject: [PATCH 2/7] Update dependabot.yml --- .github/dependabot.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4d785b7..dd1b700 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,7 @@ version: 2 updates: - package-ecosystem: "cargo" - directory: "/" # Location of package manifests + directory: "/" + target-branch: staging schedule: interval: "daily" From fd42094d5948d7aa5aa584396bcb02f567f0aa28 Mon Sep 17 00:00:00 2001 From: Torben Schweren Date: Fri, 4 Oct 2024 22:59:42 +0200 Subject: [PATCH 3/7] Merge refactor/service-weak-references into staging (#58) refactor: use Weak instead of Arc self-references --- src/event/event_repeater.rs | 54 +++++++++++++++++++++++++--------- src/service/service_manager.rs | 39 +++++++++++++++++------- 2 files changed, 68 insertions(+), 25 deletions(-) diff --git a/src/event/event_repeater.rs b/src/event/event_repeater.rs index d585df7..7d3a06a 100644 --- a/src/event/event_repeater.rs +++ b/src/event/event_repeater.rs @@ -1,20 +1,26 @@ -use std::{collections::HashMap, sync::Arc}; +use log::error; +use std::{ + collections::HashMap, + sync::{Arc, Weak}, +}; use thiserror::Error; use tokio::{sync::Mutex, task::JoinHandle}; use uuid::Uuid; +use crate::setlock::{SetLock, SetLockError}; + use super::{Event, Subscription}; #[derive(Debug, Error)] pub enum AttachError { - #[error("Tried to attach event {event_name} to EventRepeater {repeater_name} before it was initialized. Did you not use EventRepeater::new()?")] + #[error("Tried to attach event {event_name} to EventRepeater {repeater_name} while it was uninitialized. Did you not use EventRepeater::new()?")] NotInitialized { event_name: String, repeater_name: String, }, #[error( - "Tried to attach event {event_name} to EventRepeater {repeater_name}, which was already attached." + "Tried to attach event {event_name} to EventRepeater {repeater_name}, which was already attached to it." )] AlreadyAttached { event_name: String, @@ -47,7 +53,7 @@ where T: Send + Sync + 'static, { pub event: Event, - self_arc: Mutex>>, + weak: Mutex>>, subscriptions: Mutex)>>, } @@ -62,18 +68,28 @@ where { let event = Event::new(name); let event_repeater = Self { - self_arc: Mutex::new(None), + weak: Mutex::new(SetLock::new()), event, subscriptions: Mutex::new(HashMap::new()), }; - let self_arc = Arc::new(event_repeater); - let mut lock = self_arc.self_arc.lock().await; - let self_arc_clone = Arc::clone(&self_arc); - *lock = Some(self_arc_clone); - drop(lock); + let arc = Arc::new(event_repeater); + let weak = Arc::downgrade(&arc); + + let result = arc.weak.lock().await.set(weak); + if let Err(err) = result { + match err { + SetLockError::AlreadySet => { + error!("Failed to set EventRepeater {}'s Weak self-reference because it was already set. This should never happen. Shutting down ungracefully to prevent further undefined behavior.", arc.event.name); + unreachable!( + "Unable to set EventRepeater {}'s Weak self-reference because it was already set.", + arc.event.name + ); + } + } + } - self_arc + arc } pub async fn subscription_count(&self) -> usize { @@ -81,8 +97,9 @@ where } pub async fn attach(&self, event: &Event, buffer: usize) -> Result<(), AttachError> { - let self_arc = match self.self_arc.lock().await.as_ref() { - Some(arc) => Arc::clone(arc), + let lock = self.weak.lock().await; + let weak = match lock.get() { + Some(weak) => weak, None => { return Err(AttachError::NotInitialized { event_name: event.name.clone(), @@ -91,6 +108,15 @@ where } }; + // This can't fail because the Arc is guaranteed to be valid as long as &self is valid. + let arc = match weak.upgrade() { + Some(arc) => arc, + None => { + error!("EventRepeater {}'s Weak self-reference could not be upgraded to Arc while attaching event {}. This should never happen. Shutting down ungracefully to prevent further undefined behavior.", self.event.name, event.name); + unreachable!("EventRepeater {}'s Weak self-reference could not be upgraded to Arc while attaching event {}.", self.event.name, event.name); + } + }; + let mut subscriptions = self.subscriptions.lock().await; if subscriptions.contains_key(&event.uuid) { return Err(AttachError::AlreadyAttached { @@ -108,7 +134,7 @@ where let join_handle = tokio::spawn(async move { while let Some(value) = receiver.recv().await { - let _ = self_arc.event.dispatch(value).await; + let _ = arc.event.dispatch(value).await; } }); subscriptions.insert(event.uuid, (subscription, join_handle)); diff --git a/src/service/service_manager.rs b/src/service/service_manager.rs index 6d25e44..78f4ecb 100644 --- a/src/service/service_manager.rs +++ b/src/service/service_manager.rs @@ -6,7 +6,7 @@ use crate::{ event::EventRepeater, service::Watchdog, setlock::{SetLock, SetLockError} }; use log::{error, info, warn}; -use std::{collections::HashMap, fmt::Display, mem, sync::Arc, time::Duration}; +use std::{collections::HashMap, fmt::Display, mem, sync::{Arc, Weak}, time::Duration}; use tokio::{ spawn, sync::{Mutex, MutexGuard}, @@ -54,31 +54,31 @@ pub fn new() -> Self { pub async fn build(self) -> Arc { let service_manager = ServiceManager { - arc: Mutex::new(SetLock::new()), + weak: Mutex::new(SetLock::new()), services: self.services, background_tasks: Mutex::new(HashMap::new()), on_status_change: EventRepeater::new("service_manager_on_status_change").await, }; - let self_arc = Arc::new(service_manager); - let self_arc_clone = Arc::clone(&self_arc); - - let result = self_arc_clone.arc.lock().await.set(Arc::clone(&self_arc_clone)); + let arc = Arc::new(service_manager); + let weak = Arc::downgrade(&arc); + let result = arc.weak.lock().await.set(weak); if let Err(err) = result { match err { SetLockError::AlreadySet => { - unreachable!("Unable to set ServiceManager's self-arc in ServiceManagerBuilder because it was already set. This should never happen. How did you...?"); + error!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set. This should never happen. Shutting down ungracefully to prevent further undefined behavior."); + unreachable!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set."); } } } - self_arc + arc } } pub struct ServiceManager { - arc: Mutex>>, + weak: Mutex>>, background_tasks: Mutex>>, pub services: Vec>>, @@ -326,10 +326,27 @@ impl ServiceManager { &self, service: &mut MutexGuard<'_, dyn Service>, ) -> Result<(), StartupError> { - let service_manager = Arc::clone(self.arc.lock().await.unwrap()); + let lock = self.weak.lock().await; + let weak = match lock.get() { + Some(weak) => weak, + None => { + error!("ServiceManager's Weak self-reference was None while initializing service {}. This should never happen. Did you not use a ServiceManagerBuilder? Shutting down ungracefully to prevent further undefined behavior.", service.info().name); + unreachable!("ServiceManager's Weak self-reference was None while initializing service {}.", service.info().name); + } + }; + + // This can't fail because the Arc is guaranteed to be valid as long as &self is valid. + let arc = match weak.upgrade() { + Some(arc) => arc, + None => { + error!("ServiceManager's Weak self-reference could not be upgraded to Arc while initializing service {}. This should never happen. Shutting down ungracefully to prevent further undefined behavior.", service.info().name); + unreachable!("ServiceManager's Weak self-reference could not be upgraded to Arc while initializing service {}.", service.info().name); + } + }; + //TODO: Add to config instead of hardcoding duration - let start = service.start(service_manager); + let start = service.start(arc); let timeout_result = timeout(Duration::from_secs(10), start).await; match timeout_result { From e9d684fc3e284efe2ec174c4abc5475bfae241e8 Mon Sep 17 00:00:00 2001 From: Torben Schweren Date: Sat, 5 Oct 2024 21:22:41 +0200 Subject: [PATCH 4/7] Merge refactor/once-cell into staging (#62) refactor: use OnceLock instead of SetLock - Use OnceLock where SetLock was previously used - Remove SetLock --- Cargo.lock | 53 ++++++++++------------- src/event/event_repeater.rs | 29 +++++-------- src/lib.rs | 1 - src/service/discord.rs | 79 +++++++++++++++++++--------------- src/service/service_manager.rs | 23 ++++------ src/setlock.rs | 70 ------------------------------ 6 files changed, 86 insertions(+), 169 deletions(-) delete mode 100644 src/setlock.rs diff --git a/Cargo.lock b/Cargo.lock index 908265d..e6b5872 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.24" +version = "1.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +checksum = "e8d9e0b4957f635b8d3da819d0db5603620467ecf1f692d22a8c2717ce27e6d8" dependencies = [ "shlex", ] @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -646,9 +646,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -656,15 +656,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -684,15 +684,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -701,21 +701,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1361,12 +1361,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.1" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" -dependencies = [ - "portable-atomic", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" @@ -1507,12 +1504,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - [[package]] name = "powerfmt" version = "0.2.0" diff --git a/src/event/event_repeater.rs b/src/event/event_repeater.rs index 7d3a06a..ec58366 100644 --- a/src/event/event_repeater.rs +++ b/src/event/event_repeater.rs @@ -1,14 +1,12 @@ use log::error; use std::{ collections::HashMap, - sync::{Arc, Weak}, + sync::{Arc, OnceLock, Weak}, }; use thiserror::Error; use tokio::{sync::Mutex, task::JoinHandle}; use uuid::Uuid; -use crate::setlock::{SetLock, SetLockError}; - use super::{Event, Subscription}; #[derive(Debug, Error)] @@ -53,7 +51,7 @@ where T: Send + Sync + 'static, { pub event: Event, - weak: Mutex>>, + weak: OnceLock>, subscriptions: Mutex)>>, } @@ -68,7 +66,7 @@ where { let event = Event::new(name); let event_repeater = Self { - weak: Mutex::new(SetLock::new()), + weak: OnceLock::new(), event, subscriptions: Mutex::new(HashMap::new()), }; @@ -76,17 +74,13 @@ where let arc = Arc::new(event_repeater); let weak = Arc::downgrade(&arc); - let result = arc.weak.lock().await.set(weak); - if let Err(err) = result { - match err { - SetLockError::AlreadySet => { - error!("Failed to set EventRepeater {}'s Weak self-reference because it was already set. This should never happen. Shutting down ungracefully to prevent further undefined behavior.", arc.event.name); - unreachable!( - "Unable to set EventRepeater {}'s Weak self-reference because it was already set.", - arc.event.name - ); - } - } + let result = arc.weak.set(weak); + if result.is_err() { + error!("Failed to set EventRepeater {}'s Weak self-reference because it was already set. This should never happen. Shutting down ungracefully to prevent further undefined behavior.", arc.event.name); + unreachable!( + "Unable to set EventRepeater {}'s Weak self-reference because it was already set.", + arc.event.name + ); } arc @@ -97,8 +91,7 @@ where } pub async fn attach(&self, event: &Event, buffer: usize) -> Result<(), AttachError> { - let lock = self.weak.lock().await; - let weak = match lock.get() { + let weak = match self.weak.get() { Some(weak) => weak, None => { return Err(AttachError::NotInitialized { diff --git a/src/lib.rs b/src/lib.rs index dc2f19b..16d59c5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,7 +8,6 @@ pub mod config; pub mod event; pub mod log; pub mod service; -pub mod setlock; pub fn is_debug() -> bool { cfg!(debug_assertions) diff --git a/src/service/discord.rs b/src/service/discord.rs index 47ec3d2..5825363 100644 --- a/src/service/discord.rs +++ b/src/service/discord.rs @@ -1,7 +1,5 @@ -use crate::setlock::SetLock; - use super::{types::LifetimedPinnedBoxedFutureResult, Priority, Service, ServiceInfo, ServiceManager}; -use log::{error, info}; +use log::{error, info, warn}; use serenity::{ all::{GatewayIntents, Ready}, async_trait, @@ -12,7 +10,10 @@ use serenity::{ prelude::TypeMap, Client, Error, }; -use std::{sync::Arc, time::Duration}; +use std::{ + sync::{Arc, OnceLock}, + time::Duration, +}; use tokio::{ select, spawn, sync::{Mutex, Notify, RwLock}, @@ -24,14 +25,14 @@ use tokio::{ pub struct DiscordService { info: ServiceInfo, discord_token: String, - pub ready: Arc>>, + pub ready: Arc>, client_handle: Option>>, - pub cache: SetLock>, - pub data: SetLock>>, - pub http: SetLock>, - pub shard_manager: SetLock>, - pub voice_manager: SetLock>, - pub ws_url: SetLock>>, + pub cache: OnceLock>, + pub data: OnceLock>>, + pub http: OnceLock>, + pub shard_manager: OnceLock>, + pub voice_manager: OnceLock>, + pub ws_url: OnceLock>>, } impl DiscordService { @@ -39,14 +40,14 @@ impl DiscordService { Self { info: ServiceInfo::new("lum_builtin_discord", "Discord", Priority::Essential), discord_token: discord_token.to_string(), - ready: Arc::new(Mutex::new(SetLock::new())), + ready: Arc::new(OnceLock::new()), client_handle: None, - cache: SetLock::new(), - data: SetLock::new(), - http: SetLock::new(), - shard_manager: SetLock::new(), - voice_manager: SetLock::new(), - ws_url: SetLock::new(), + cache: OnceLock::new(), + data: OnceLock::new(), + http: OnceLock::new(), + shard_manager: OnceLock::new(), + voice_manager: OnceLock::new(), + ws_url: OnceLock::new(), } } } @@ -71,30 +72,38 @@ impl Service for DiscordService { )) .await?; - if let Err(error) = self.cache.set(Arc::clone(&client.cache)) { - return Err(format!("Failed to set cache SetLock: {}", error).into()); + if self.cache.set(Arc::clone(&client.cache)).is_err() { + error!("Could not set cache OnceLock because it was already set. This should never happen."); + return Err("Could not set cache OnceLock because it was already set.".into()); } - if let Err(error) = self.data.set(Arc::clone(&client.data)) { - return Err(format!("Failed to set data SetLock: {}", error).into()); + if self.data.set(Arc::clone(&client.data)).is_err() { + error!("Could not set data OnceLock because it was already set. This should never happen."); + return Err("Could not set data OnceLock because it was already set.".into()); } - if let Err(error) = self.http.set(Arc::clone(&client.http)) { - return Err(format!("Failed to set http SetLock: {}", error).into()); + if self.http.set(Arc::clone(&client.http)).is_err() { + error!("Could not set http OnceLock because it was already set. This should never happen."); + return Err("Could not set http OnceLock because it was already set.".into()); } - if let Err(error) = self.shard_manager.set(Arc::clone(&client.shard_manager)) { - return Err(format!("Failed to set shard_manager SetLock: {}", error).into()); + if self.shard_manager.set(Arc::clone(&client.shard_manager)).is_err() { + error!("Could not set shard_manager OnceLock because it was already set. This should never happen."); + return Err("Could not set shard_manager OnceLock because it was already set.".into()); } if let Some(voice_manager) = &client.voice_manager { - if let Err(error) = self.voice_manager.set(Arc::clone(voice_manager)) { - return Err(format!("Failed to set voice_manager SetLock: {}", error).into()); + if self.voice_manager.set(Arc::clone(voice_manager)).is_err() { + error!("Could not set voice_manager OnceLock because it was already set. This should never happen."); + return Err("Could not set voice_manager OnceLock because it was already set.".into()); } + } else { + warn!("Voice manager is not available"); } - if let Err(error) = self.ws_url.set(Arc::clone(&client.ws_url)) { - return Err(format!("Failed to set ws_url SetLock: {}", error).into()); + if self.ws_url.set(Arc::clone(&client.ws_url)).is_err() { + error!("Could not set ws_url OnceLock because it was already set. This should never happen."); + return Err("Could not set ws_url OnceLock because it was already set.".into()); } let client_handle = spawn(async move { client.start().await }); @@ -138,12 +147,12 @@ impl Service for DiscordService { } struct EventHandler { - client: Arc>>, + client: Arc>, ready_notify: Arc, } impl EventHandler { - pub fn new(client: Arc>>, ready_notify: Arc) -> Self { + pub fn new(client: Arc>, ready_notify: Arc) -> Self { Self { client, ready_notify } } } @@ -152,9 +161,9 @@ impl EventHandler { impl client::EventHandler for EventHandler { async fn ready(&self, _ctx: Context, data_about_bot: Ready) { info!("Connected to Discord as {}", data_about_bot.user.tag()); - if let Err(error) = self.client.lock().await.set(data_about_bot) { - error!("Failed to set client SetLock: {}", error); - panic!("Failed to set client SetLock: {}", error); + if self.client.set(data_about_bot).is_err() { + error!("Could not set client OnceLock because it was already set. This should never happen."); + panic!("Could not set client OnceLock because it was already set"); } self.ready_notify.notify_one(); } diff --git a/src/service/service_manager.rs b/src/service/service_manager.rs index 78f4ecb..f715e5b 100644 --- a/src/service/service_manager.rs +++ b/src/service/service_manager.rs @@ -3,10 +3,10 @@ use super::{ types::{LifetimedPinnedBoxedFuture, OverallStatus, Priority, ShutdownError, StartupError, Status}, }; use crate::{ - event::EventRepeater, service::Watchdog, setlock::{SetLock, SetLockError} + event::EventRepeater, service::Watchdog }; use log::{error, info, warn}; -use std::{collections::HashMap, fmt::Display, mem, sync::{Arc, Weak}, time::Duration}; +use std::{collections::HashMap, fmt::Display, mem, sync::{Arc, OnceLock, Weak}, time::Duration}; use tokio::{ spawn, sync::{Mutex, MutexGuard}, @@ -54,7 +54,7 @@ pub fn new() -> Self { pub async fn build(self) -> Arc { let service_manager = ServiceManager { - weak: Mutex::new(SetLock::new()), + weak: OnceLock::new(), services: self.services, background_tasks: Mutex::new(HashMap::new()), on_status_change: EventRepeater::new("service_manager_on_status_change").await, @@ -63,14 +63,10 @@ pub fn new() -> Self { let arc = Arc::new(service_manager); let weak = Arc::downgrade(&arc); - let result = arc.weak.lock().await.set(weak); - if let Err(err) = result { - match err { - SetLockError::AlreadySet => { - error!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set. This should never happen. Shutting down ungracefully to prevent further undefined behavior."); - unreachable!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set."); - } - } + let result = arc.weak.set(weak); + if result.is_err() { + error!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set. This should never happen. Shutting down ungracefully to prevent further undefined behavior."); + unreachable!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set."); } arc @@ -78,7 +74,7 @@ pub fn new() -> Self { } pub struct ServiceManager { - weak: Mutex>>, + weak: OnceLock>, background_tasks: Mutex>>, pub services: Vec>>, @@ -326,8 +322,7 @@ impl ServiceManager { &self, service: &mut MutexGuard<'_, dyn Service>, ) -> Result<(), StartupError> { - let lock = self.weak.lock().await; - let weak = match lock.get() { + let weak = match self.weak.get() { Some(weak) => weak, None => { error!("ServiceManager's Weak self-reference was None while initializing service {}. This should never happen. Did you not use a ServiceManagerBuilder? Shutting down ungracefully to prevent further undefined behavior.", service.info().name); diff --git a/src/setlock.rs b/src/setlock.rs deleted file mode 100644 index 7bee17c..0000000 --- a/src/setlock.rs +++ /dev/null @@ -1,70 +0,0 @@ -use std::{error::Error, fmt::Display}; - -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] -pub enum SetLockError { - AlreadySet, -} - -impl Display for SetLockError { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match self { - SetLockError::AlreadySet => write!(f, "AlreadySet"), - } - } -} - -impl Error for SetLockError {} - -pub struct SetLock { - data: Option, -} - -impl SetLock { - pub fn new() -> Self { - Self { data: None } - } - - pub fn set(&mut self, data: T) -> Result<(), SetLockError> { - if self.data.is_some() { - return Err(SetLockError::AlreadySet); - } - - self.data = Some(data); - - Ok(()) - } - - pub fn is_set(&self) -> bool { - self.data.is_some() - } - - pub fn unwrap(&self) -> &T { - if self.data.is_none() { - panic!("unwrap called on an unset SetLock"); - } - - self.data.as_ref().unwrap() - } - - pub fn unwrap_mut(&mut self) -> &mut T { - if self.data.is_none() { - panic!("unwrap_mut called on an unset SetLock"); - } - - self.data.as_mut().unwrap() - } - - pub fn get(&self) -> Option<&T> { - self.data.as_ref() - } - - pub fn get_mut(&mut self) -> Option<&mut T> { - self.data.as_mut() - } -} - -impl Default for SetLock { - fn default() -> Self { - Self::new() - } -} From 3b1db0ce7bd59da69e0c56869d162bbf8a00a2c8 Mon Sep 17 00:00:00 2001 From: Torben Schweren Date: Sat, 5 Oct 2024 23:16:34 +0200 Subject: [PATCH 5/7] Merge refactor/async into staging (#63) refactor: use async_trait where possible --- Cargo.lock | 1 + Cargo.toml | 3 +- src/bot.rs | 22 ++--- src/service.rs | 6 +- src/service/discord.rs | 135 ++++++++++++++-------------- src/service/service.rs | 15 ++-- src/service/service_manager.rs | 156 ++++++++++++++++----------------- src/service/types.rs | 20 +++-- src/service/watchdog.rs | 7 +- 9 files changed, 180 insertions(+), 185 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e6b5872..2f0e3c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1182,6 +1182,7 @@ dependencies = [ name = "lum" version = "0.2.1" dependencies = [ + "async-trait", "dirs", "downcast-rs", "fern", diff --git a/Cargo.toml b/Cargo.toml index 6f9421f..ea753bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,7 @@ repository = "https://github.com/Kitt3120/lum" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +async-trait = "0.1.83" dirs = "5.0.1" downcast-rs = "1.2.0" fern = { version = "0.6.2", features = ["chrono", "colored", "date-based"] } @@ -23,4 +24,4 @@ serenity = { version = "0.12.0", default-features=false, features = ["builder", sqlx = { version = "0.8.0", features = ["runtime-tokio", "any", "postgres", "mysql", "sqlite", "tls-native-tls", "migrate", "macros", "uuid", "chrono", "json"] } thiserror = "1.0.52" tokio = { version = "1.35.1", features = ["full"] } -uuid = { version = "1.10.0", features = ["fast-rng", "macro-diagnostics", "v4"] } \ No newline at end of file +uuid = { version = "1.10.0", features = ["fast-rng", "macro-diagnostics", "v4"] } diff --git a/src/bot.rs b/src/bot.rs index 37dce6e..7f693ab 100644 --- a/src/bot.rs +++ b/src/bot.rs @@ -4,9 +4,7 @@ use std::{fmt::Display, sync::Arc}; use log::error; use tokio::{signal, sync::Mutex}; -use crate::service::{ - types::LifetimedPinnedBoxedFuture, OverallStatus, Service, ServiceManager, ServiceManagerBuilder, -}; +use crate::service::{OverallStatus, Service, ServiceManager, ServiceManagerBuilder}; #[derive(Debug, Clone, Copy)] pub enum ExitReason { @@ -68,20 +66,14 @@ impl Bot { BotBuilder::new(name) } - //TODO: When Rust allows async trait methods to be object-safe, refactor this to use async instead of returning a future - pub fn start(&mut self) -> LifetimedPinnedBoxedFuture<'_, ()> { - Box::pin(async move { - self.service_manager.start_services().await; - //TODO: Potential for further initialization here, like modules - }) + pub async fn start(&mut self) { + self.service_manager.start_services().await; + //TODO: Potential for further initialization here, like modules } - //TODO: When Rust allows async trait methods to be object-safe, refactor this to use async instead of returning a future - pub fn stop(&mut self) -> LifetimedPinnedBoxedFuture<'_, ()> { - Box::pin(async move { - self.service_manager.stop_services().await; - //TODO: Potential for further deinitialization here, like modules - }) + pub async fn stop(&mut self) { + self.service_manager.stop_services().await; + //TODO: Potential for further deinitialization here, like modules } pub async fn join(&self) -> ExitReason { diff --git a/src/service.rs b/src/service.rs index e835fc2..b45e5b7 100644 --- a/src/service.rs +++ b/src/service.rs @@ -1,6 +1,4 @@ pub mod discord; -// TODO: Used for downcast_rs. Maybe this can be removed when updating the crate. -#[allow(clippy::multiple_bound_locations)] pub mod service; // Will be fixed when lum gets seperated into multiple workspaces pub mod service_manager; pub mod types; @@ -9,7 +7,7 @@ pub mod watchdog; pub use service::{Service, ServiceInfo}; pub use service_manager::{ServiceManager, ServiceManagerBuilder}; pub use types::{ - BoxedError, BoxedFuture, BoxedFutureResult, OverallStatus, PinnedBoxedFuture, PinnedBoxedFutureResult, - Priority, ShutdownError, StartupError, Status, + BoxedError, LifetimedPinnedBoxedFuture, LifetimedPinnedBoxedFutureResult, OverallStatus, + PinnedBoxedFuture, PinnedBoxedFutureResult, Priority, ShutdownError, StartupError, Status, }; pub use watchdog::Watchdog; diff --git a/src/service/discord.rs b/src/service/discord.rs index 5825363..5fea4a6 100644 --- a/src/service/discord.rs +++ b/src/service/discord.rs @@ -1,4 +1,4 @@ -use super::{types::LifetimedPinnedBoxedFutureResult, Priority, Service, ServiceInfo, ServiceManager}; +use super::{BoxedError, Priority, Service, ServiceInfo, ServiceManager}; use log::{error, info, warn}; use serenity::{ all::{GatewayIntents, Ready}, @@ -52,97 +52,97 @@ impl DiscordService { } } +//TODO: When Rust allows async trait methods to be object-safe, refactor this to not use async_trait anymore +#[async_trait] impl Service for DiscordService { fn info(&self) -> &ServiceInfo { &self.info } - fn start(&mut self, _service_manager: Arc) -> LifetimedPinnedBoxedFutureResult<'_, ()> { - Box::pin(async move { - let client_ready_notify = Arc::new(Notify::new()); + async fn start(&mut self, _service_manager: Arc) -> Result<(), BoxedError> { + let client_ready_notify = Arc::new(Notify::new()); - let framework = StandardFramework::new(); - framework.configure(Configuration::new().prefix("!")); + let framework = StandardFramework::new(); + framework.configure(Configuration::new().prefix("!")); - let mut client = Client::builder(self.discord_token.as_str(), GatewayIntents::all()) - .framework(framework) - .event_handler(EventHandler::new( - Arc::clone(&self.ready), - Arc::clone(&client_ready_notify), - )) - .await?; + let mut client = Client::builder(self.discord_token.as_str(), GatewayIntents::all()) + .framework(framework) + .event_handler(EventHandler::new( + Arc::clone(&self.ready), + Arc::clone(&client_ready_notify), + )) + .await?; - if self.cache.set(Arc::clone(&client.cache)).is_err() { - error!("Could not set cache OnceLock because it was already set. This should never happen."); - return Err("Could not set cache OnceLock because it was already set.".into()); - } + if self.cache.set(Arc::clone(&client.cache)).is_err() { + error!("Could not set cache OnceLock because it was already set. This should never happen."); + return Err("Could not set cache OnceLock because it was already set.".into()); + } - if self.data.set(Arc::clone(&client.data)).is_err() { - error!("Could not set data OnceLock because it was already set. This should never happen."); - return Err("Could not set data OnceLock because it was already set.".into()); - } + if self.data.set(Arc::clone(&client.data)).is_err() { + error!("Could not set data OnceLock because it was already set. This should never happen."); + return Err("Could not set data OnceLock because it was already set.".into()); + } - if self.http.set(Arc::clone(&client.http)).is_err() { - error!("Could not set http OnceLock because it was already set. This should never happen."); - return Err("Could not set http OnceLock because it was already set.".into()); - } + if self.http.set(Arc::clone(&client.http)).is_err() { + error!("Could not set http OnceLock because it was already set. This should never happen."); + return Err("Could not set http OnceLock because it was already set.".into()); + } - if self.shard_manager.set(Arc::clone(&client.shard_manager)).is_err() { - error!("Could not set shard_manager OnceLock because it was already set. This should never happen."); - return Err("Could not set shard_manager OnceLock because it was already set.".into()); - } + if self.shard_manager.set(Arc::clone(&client.shard_manager)).is_err() { + error!( + "Could not set shard_manager OnceLock because it was already set. This should never happen." + ); + return Err("Could not set shard_manager OnceLock because it was already set.".into()); + } - if let Some(voice_manager) = &client.voice_manager { - if self.voice_manager.set(Arc::clone(voice_manager)).is_err() { - error!("Could not set voice_manager OnceLock because it was already set. This should never happen."); - return Err("Could not set voice_manager OnceLock because it was already set.".into()); - } - } else { - warn!("Voice manager is not available"); + if let Some(voice_manager) = &client.voice_manager { + if self.voice_manager.set(Arc::clone(voice_manager)).is_err() { + error!("Could not set voice_manager OnceLock because it was already set. This should never happen."); + return Err("Could not set voice_manager OnceLock because it was already set.".into()); } + } else { + warn!("Voice manager is not available"); + } - if self.ws_url.set(Arc::clone(&client.ws_url)).is_err() { - error!("Could not set ws_url OnceLock because it was already set. This should never happen."); - return Err("Could not set ws_url OnceLock because it was already set.".into()); - } + if self.ws_url.set(Arc::clone(&client.ws_url)).is_err() { + error!("Could not set ws_url OnceLock because it was already set. This should never happen."); + return Err("Could not set ws_url OnceLock because it was already set.".into()); + } - let client_handle = spawn(async move { client.start().await }); + let client_handle = spawn(async move { client.start().await }); - select! { - _ = client_ready_notify.notified() => {}, - _ = sleep(Duration::from_secs(2)) => {}, - } + select! { + _ = client_ready_notify.notified() => {}, + _ = sleep(Duration::from_secs(2)) => {}, + } - if client_handle.is_finished() { - client_handle.await??; - return Err("Discord client stopped unexpectedly".into()); - } + if client_handle.is_finished() { + client_handle.await??; + return Err("Discord client stopped unexpectedly".into()); + } - self.client_handle = Some(client_handle); - Ok(()) - }) + self.client_handle = Some(client_handle); + Ok(()) } - fn stop(&mut self) -> LifetimedPinnedBoxedFutureResult<'_, ()> { - Box::pin(async move { - if let Some(client_handle) = self.client_handle.take() { - info!("Waiting for Discord client to stop..."); + async fn stop(&mut self) -> Result<(), BoxedError> { + if let Some(client_handle) = self.client_handle.take() { + info!("Waiting for Discord client to stop..."); - client_handle.abort(); // Should trigger a JoinError in the client_handle, if the task hasn't already ended + client_handle.abort(); // Should trigger a JoinError in the client_handle, if the task hasn't already ended - // If the thread ended WITHOUT a JoinError, the client already stopped unexpectedly - let result = async move { - match client_handle.await { - Ok(result) => result, - Err(_) => Ok(()), - } + // If the thread ended WITHOUT a JoinError, the client already stopped unexpectedly + let result = async move { + match client_handle.await { + Ok(result) => result, + Err(_) => Ok(()), } - .await; - result?; } + .await; + result?; + } - Ok(()) - }) + Ok(()) } } @@ -157,6 +157,7 @@ impl EventHandler { } } +//TODO: When Rust allows async trait methods to be object-safe, refactor this to not use async_trait anymore #[async_trait] impl client::EventHandler for EventHandler { async fn ready(&self, _ctx: Context, data_about_bot: Ready) { diff --git a/src/service/service.rs b/src/service/service.rs index 4c0c83a..b12fb24 100644 --- a/src/service/service.rs +++ b/src/service/service.rs @@ -4,13 +4,15 @@ use std::{ sync::Arc, }; +use async_trait::async_trait; use downcast_rs::{impl_downcast, DowncastSync}; use crate::event::Observable; use super::{ service_manager::ServiceManager, - types::{LifetimedPinnedBoxedFuture, LifetimedPinnedBoxedFutureResult, Priority, Status}, + types::{Priority, Status}, + BoxedError, LifetimedPinnedBoxedFutureResult, }; #[derive(Debug)] @@ -58,17 +60,18 @@ impl Hash for ServiceInfo { self.id.hash(state); } } -//TODO: When Rust allows async trait methods to be object-safe, refactor this to use async instead of returning a PinnedBoxedFutureResult +//TODO: When Rust allows async trait methods to be object-safe, refactor this to not use async_trait anymore +#[async_trait] pub trait Service: DowncastSync { fn info(&self) -> &ServiceInfo; - fn start(&mut self, service_manager: Arc) -> LifetimedPinnedBoxedFutureResult<'_, ()>; - fn stop(&mut self) -> LifetimedPinnedBoxedFutureResult<'_, ()>; + async fn start(&mut self, service_manager: Arc) -> Result<(), BoxedError>; + async fn stop(&mut self) -> Result<(), BoxedError>; fn task<'a>(&self) -> Option> { None } - fn is_available(&self) -> LifetimedPinnedBoxedFuture<'_, bool> { - Box::pin(async move { matches!(self.info().status.get().await, Status::Started) }) + async fn is_available(&self) -> bool { + matches!(self.info().status.get().await, Status::Started) } } diff --git a/src/service/service_manager.rs b/src/service/service_manager.rs index f715e5b..ad5e3a9 100644 --- a/src/service/service_manager.rs +++ b/src/service/service_manager.rs @@ -1,12 +1,12 @@ use super::{ service::Service, - types::{LifetimedPinnedBoxedFuture, OverallStatus, Priority, ShutdownError, StartupError, Status}, + types::{OverallStatus, Priority, ShutdownError, StartupError, Status}, }; use crate::{ event::EventRepeater, service::Watchdog }; use log::{error, info, warn}; -use std::{collections::HashMap, fmt::Display, mem, sync::{Arc, OnceLock, Weak}, time::Duration}; +use std::{collections::HashMap, fmt::{self, Display}, mem, sync::{Arc, OnceLock, Weak}, time::Duration}; use tokio::{ spawn, sync::{Mutex, MutexGuard}, @@ -217,105 +217,101 @@ impl ServiceManager { } //TODO: When Rust allows async closures, refactor this to use iterator methods instead of for loop - pub fn overall_status(&self) -> LifetimedPinnedBoxedFuture<'_, OverallStatus> { - Box::pin(async move { - for service in self.services.iter() { - let service = service.lock().await; + pub async fn overall_status(&self) -> OverallStatus { + for service in self.services.iter() { + let service = service.lock().await; - if service.info().priority != Priority::Essential { - continue; - } + if service.info().priority != Priority::Essential { + continue; + } - let status = service.info().status.get().await; - if status != Status::Started { - return OverallStatus::Unhealthy; - } + let status = service.info().status.get().await; + if status != Status::Started { + return OverallStatus::Unhealthy; } + } - OverallStatus::Healthy - }) + OverallStatus::Healthy } //TODO: When Rust allows async closures, refactor this to use iterator methods instead of for loop - pub fn status_overview(&self) -> LifetimedPinnedBoxedFuture<'_, String> { - Box::pin(async move { - let mut text_buffer = String::new(); - - let mut failed_essentials = Vec::new(); - let mut failed_optionals = Vec::new(); - let mut non_failed_essentials = Vec::new(); - let mut non_failed_optionals = Vec::new(); - let mut others = Vec::new(); + pub async fn status_overview(&self) -> String { + let mut text_buffer = String::new(); - for service in self.services.iter() { - let service = service.lock().await; - let info = service.info(); - let priority = &info.priority; - let status = info.status.get().await; + let mut failed_essentials = Vec::new(); + let mut failed_optionals = Vec::new(); + let mut non_failed_essentials = Vec::new(); + let mut non_failed_optionals = Vec::new(); + let mut others = Vec::new(); - match status { - Status::Started | Status::Stopped => match priority { + for service in self.services.iter() { + let service = service.lock().await; + let info = service.info(); + let priority = &info.priority; + let status = info.status.get().await; + + match status { + Status::Started | Status::Stopped => match priority { + Priority::Essential => { + non_failed_essentials.push(format!(" - {}: {}", info.name, status)); + } + Priority::Optional => { + non_failed_optionals.push(format!(" - {}: {}", info.name, status)); + } + }, + Status::FailedToStart(_) | Status::FailedToStop(_) | Status::RuntimeError(_) => { + match priority { Priority::Essential => { - non_failed_essentials.push(format!(" - {}: {}", info.name, status)); + failed_essentials.push(format!(" - {}: {}", info.name, status)); } Priority::Optional => { - non_failed_optionals.push(format!(" - {}: {}", info.name, status)); + failed_optionals.push(format!(" - {}: {}", info.name, status)); } - }, - Status::FailedToStart(_) | Status::FailedToStop(_) | Status::RuntimeError(_) => { - match priority { - Priority::Essential => { - failed_essentials.push(format!(" - {}: {}", info.name, status)); - } - Priority::Optional => { - failed_optionals.push(format!(" - {}: {}", info.name, status)); - } - } - } - _ => { - others.push(format!(" - {}: {}", info.name, status)); } } + _ => { + others.push(format!(" - {}: {}", info.name, status)); + } } + } - if !failed_essentials.is_empty() { - text_buffer.push_str(&format!("{}:\n", "Failed essential services")); - text_buffer.push_str(failed_essentials.join("\n").as_str()); - } - - if !failed_optionals.is_empty() { - text_buffer.push_str(&format!("{}:\n", "Failed optional services")); - text_buffer.push_str(failed_optionals.join("\n").as_str()); - } + if !failed_essentials.is_empty() { + text_buffer.push_str(&format!("{}:\n", "Failed essential services")); + text_buffer.push_str(failed_essentials.join("\n").as_str()); + } - if !non_failed_essentials.is_empty() { - text_buffer.push_str(&format!("{}:\n", "Essential services")); - text_buffer.push_str(non_failed_essentials.join("\n").as_str()); - } + if !failed_optionals.is_empty() { + text_buffer.push_str(&format!("{}:\n", "Failed optional services")); + text_buffer.push_str(failed_optionals.join("\n").as_str()); + } - if !non_failed_optionals.is_empty() { - text_buffer.push_str(&format!("{}:\n", "Optional services")); - text_buffer.push_str(non_failed_optionals.join("\n").as_str()); - } + if !non_failed_essentials.is_empty() { + text_buffer.push_str(&format!("{}:\n", "Essential services")); + text_buffer.push_str(non_failed_essentials.join("\n").as_str()); + } - if !others.is_empty() { - text_buffer.push_str(&format!("{}:\n", "Other services")); - text_buffer.push_str(others.join("\n").as_str()); - } + if !non_failed_optionals.is_empty() { + text_buffer.push_str(&format!("{}:\n", "Optional services")); + text_buffer.push_str(non_failed_optionals.join("\n").as_str()); + } - let longest_width = text_buffer - .lines() - .map(|line| line.len()) - .max() - .unwrap_or(0); - - let mut headline = String::from("Status overview\n"); - headline.push_str("─".repeat(longest_width).as_str()); - headline.push('\n'); - text_buffer.insert_str(0, &headline); + if !others.is_empty() { + text_buffer.push_str(&format!("{}:\n", "Other services")); + text_buffer.push_str(others.join("\n").as_str()); + } - text_buffer - }) + let longest_width = text_buffer + .lines() + .map(|line| line.len()) + .max() + .unwrap_or(0); + + let mut headline = String::from("Status overview\n"); + headline.push_str("─".repeat(longest_width).as_str()); + headline.push('\n'); + text_buffer.insert_str(0, &headline); + + text_buffer } async fn init_service( @@ -486,7 +482,7 @@ impl ServiceManager { } impl Display for ServiceManager { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "Services: ")?; if self.services.is_empty() { diff --git a/src/service/types.rs b/src/service/types.rs index 6d388de..70c383c 100644 --- a/src/service/types.rs +++ b/src/service/types.rs @@ -1,4 +1,9 @@ -use std::{error::Error, fmt::Display, future::Future, pin::Pin}; +use std::{ + error::Error, + fmt::{self, Display}, + future::Future, + pin::Pin, +}; use thiserror::Error; @@ -6,13 +11,10 @@ use crate::event::event_repeater::{AttachError, DetachError}; pub type BoxedError = Box; -pub type BoxedFuture = Box + Send>; -pub type BoxedFutureResult = BoxedFuture>; - -pub type PinnedBoxedFuture = Pin + Send>>; +pub type PinnedBoxedFuture = Pin + Send + Sync>>; pub type PinnedBoxedFutureResult = PinnedBoxedFuture>; -pub type LifetimedPinnedBoxedFuture<'a, T> = Pin + Send + 'a>>; +pub type LifetimedPinnedBoxedFuture<'a, T> = Pin + Send + Sync + 'a>>; pub type LifetimedPinnedBoxedFutureResult<'a, T> = LifetimedPinnedBoxedFuture<'a, Result>; #[derive(Debug, Clone)] @@ -27,7 +29,7 @@ pub enum Status { } impl Display for Status { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Status::Started => write!(f, "Started"), Status::Stopped => write!(f, "Stopped"), @@ -64,7 +66,7 @@ pub enum OverallStatus { } impl Display for OverallStatus { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { OverallStatus::Healthy => write!(f, "Healthy"), OverallStatus::Unhealthy => write!(f, "Unhealthy"), @@ -79,7 +81,7 @@ pub enum Priority { } impl Display for Priority { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Priority::Essential => write!(f, "Essential"), Priority::Optional => write!(f, "Optional"), diff --git a/src/service/watchdog.rs b/src/service/watchdog.rs index 2eb53a9..6b686db 100644 --- a/src/service/watchdog.rs +++ b/src/service/watchdog.rs @@ -1,4 +1,3 @@ -use super::types::LifetimedPinnedBoxedFuture; use log::error; use serenity::FutureExt; use std::{future::Future, mem::replace, sync::Arc}; @@ -7,6 +6,8 @@ use tokio::sync::{ Mutex, }; +use super::LifetimedPinnedBoxedFuture; + //TODO: Rename to TaskChain and use Event instead of manual subscriber handling pub struct Watchdog<'a, T: Send> { task: LifetimedPinnedBoxedFuture<'a, T>, @@ -23,8 +24,8 @@ impl<'a, T: 'a + Send> Watchdog<'a, T> { pub fn append(&mut self, task: FN) where - FN: FnOnce(T) -> FUT + Send + 'a, - FUT: Future + Send + 'a, + FN: FnOnce(T) -> FUT + Send + Sync + 'a, + FUT: Future + Send + Sync + 'a, { let previous_task = replace( &mut self.task, From be59717f6cf7c8189c6ee5bd324e2090ac83eaaf Mon Sep 17 00:00:00 2001 From: Torben Schweren Date: Sat, 5 Oct 2024 23:37:00 +0200 Subject: [PATCH 6/7] Merge feature/cargo-optimizations into staging (#64) add: Cargo.toml settings --- Cargo.toml | 16 +++++-- rustfmt.toml | 1 - src/event/event.rs | 13 +++-- src/event/subscriber.rs | 8 +++- src/main.rs | 10 +++- src/service/discord.rs | 23 +++++++-- src/service/service_manager.rs | 87 ++++++++++++++++++++++++---------- src/service/types.rs | 3 +- 8 files changed, 117 insertions(+), 44 deletions(-) delete mode 100644 rustfmt.toml diff --git a/Cargo.toml b/Cargo.toml index ea753bc..673bf69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,25 @@ [package] name = "lum" version = "0.2.1" +authors = ["Torben Schweren"] edition = "2021" +rust-version = "1.80.0" description = "Lum Discord Bot" -license= "MIT" readme = "README.md" -authors = ["Torben Schweren"] repository = "https://github.com/Kitt3120/lum" +license= "MIT" +keywords = ["chat", "discord", "bot", "framework"] +categories = ["chat", "discord", "framework"] +[profile.release] +debug = false +opt-level = 3 +lto = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[profile.dev] +debug = true +opt-level = 0 +lto = false [dependencies] async-trait = "0.1.83" diff --git a/rustfmt.toml b/rustfmt.toml deleted file mode 100644 index 521c9cf..0000000 --- a/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -max_width = 110 \ No newline at end of file diff --git a/src/event/event.rs b/src/event/event.rs index d714381..80e833c 100644 --- a/src/event/event.rs +++ b/src/event/event.rs @@ -50,7 +50,12 @@ where S: Into, { let (sender, receiver) = channel(buffer); - let subscriber = Subscriber::new(name, log_on_error, remove_on_error, Callback::Channel(sender)); + let subscriber = Subscriber::new( + name, + log_on_error, + remove_on_error, + Callback::Channel(sender), + ); let subscription = Subscription::from(&subscriber); let receiver_subscription = ReceiverSubscription::new(subscription, receiver); @@ -116,9 +121,9 @@ where let subscription_to_remove = subscription.into(); let mut subscribers = self.subscribers.lock().await; - let index = subscribers - .iter() - .position(|subscription_of_event| subscription_of_event.uuid == subscription_to_remove.uuid); + let index = subscribers.iter().position(|subscription_of_event| { + subscription_of_event.uuid == subscription_to_remove.uuid + }); if let Some(index) = index { subscribers.remove(index); diff --git a/src/event/subscriber.rs b/src/event/subscriber.rs index 8fd8e51..cf54323 100644 --- a/src/event/subscriber.rs +++ b/src/event/subscriber.rs @@ -61,9 +61,13 @@ where pub async fn dispatch(&self, data: Arc) -> Result<(), DispatchError> { match &self.callback { - Callback::Channel(sender) => sender.send(data).await.map_err(DispatchError::ChannelSend), + Callback::Channel(sender) => { + sender.send(data).await.map_err(DispatchError::ChannelSend) + } Callback::Closure(closure) => closure(data).map_err(DispatchError::Closure), - Callback::AsyncClosure(closure) => closure(data).await.map_err(DispatchError::AsyncClosure), + Callback::AsyncClosure(closure) => { + closure(data).await.map_err(DispatchError::AsyncClosure) + } } } } diff --git a/src/main.rs b/src/main.rs index 9cc1d1c..3e059c9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,7 +23,10 @@ async fn main() { let config = match config_handler.load_config() { Ok(config) => config, Err(err) => { - error!("Error reading config file: {}\n{} will exit.", err, BOT_NAME); + error!( + "Error reading config file: {}\n{} will exit.", + err, BOT_NAME + ); return; } }; @@ -39,7 +42,10 @@ async fn main() { fn setup_logger() { if let Err(error) = log::setup() { - panic!("Error setting up the Logger: {}\n{} will exit.", error, BOT_NAME); + panic!( + "Error setting up the Logger: {}\n{} will exit.", + error, BOT_NAME + ); } } diff --git a/src/service/discord.rs b/src/service/discord.rs index 5fea4a6..2ee3050 100644 --- a/src/service/discord.rs +++ b/src/service/discord.rs @@ -79,16 +79,24 @@ impl Service for DiscordService { } if self.data.set(Arc::clone(&client.data)).is_err() { - error!("Could not set data OnceLock because it was already set. This should never happen."); + error!( + "Could not set data OnceLock because it was already set. This should never happen." + ); return Err("Could not set data OnceLock because it was already set.".into()); } if self.http.set(Arc::clone(&client.http)).is_err() { - error!("Could not set http OnceLock because it was already set. This should never happen."); + error!( + "Could not set http OnceLock because it was already set. This should never happen." + ); return Err("Could not set http OnceLock because it was already set.".into()); } - if self.shard_manager.set(Arc::clone(&client.shard_manager)).is_err() { + if self + .shard_manager + .set(Arc::clone(&client.shard_manager)) + .is_err() + { error!( "Could not set shard_manager OnceLock because it was already set. This should never happen." ); @@ -98,7 +106,9 @@ impl Service for DiscordService { if let Some(voice_manager) = &client.voice_manager { if self.voice_manager.set(Arc::clone(voice_manager)).is_err() { error!("Could not set voice_manager OnceLock because it was already set. This should never happen."); - return Err("Could not set voice_manager OnceLock because it was already set.".into()); + return Err( + "Could not set voice_manager OnceLock because it was already set.".into(), + ); } } else { warn!("Voice manager is not available"); @@ -153,7 +163,10 @@ struct EventHandler { impl EventHandler { pub fn new(client: Arc>, ready_notify: Arc) -> Self { - Self { client, ready_notify } + Self { + client, + ready_notify, + } } } diff --git a/src/service/service_manager.rs b/src/service/service_manager.rs index ad5e3a9..334b666 100644 --- a/src/service/service_manager.rs +++ b/src/service/service_manager.rs @@ -2,11 +2,15 @@ use super::{ service::Service, types::{OverallStatus, Priority, ShutdownError, StartupError, Status}, }; -use crate::{ - event::EventRepeater, service::Watchdog -}; +use crate::{event::EventRepeater, service::Watchdog}; use log::{error, info, warn}; -use std::{collections::HashMap, fmt::{self, Display}, mem, sync::{Arc, OnceLock, Weak}, time::Duration}; +use std::{ + collections::HashMap, + fmt::{self, Display}, + mem, + sync::{Arc, OnceLock, Weak}, + time::Duration, +}; use tokio::{ spawn, sync::{Mutex, MutexGuard}, @@ -20,8 +24,10 @@ pub struct ServiceManagerBuilder { } impl ServiceManagerBuilder { -pub fn new() -> Self { - Self { services: Vec::new() } + pub fn new() -> Self { + Self { + services: Vec::new(), + } } //TODO: When Rust allows async closures, refactor this to use iterator methods instead of for loop @@ -65,8 +71,8 @@ pub fn new() -> Self { let result = arc.weak.set(weak); if result.is_err() { - error!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set. This should never happen. Shutting down ungracefully to prevent further undefined behavior."); - unreachable!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set."); + error!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set. This should never happen. Shutting down ungracefully to prevent further undefined behavior."); + unreachable!("Unable to set ServiceManager's Weak self-reference in ServiceManagerBuilder because it was already set."); } arc @@ -86,8 +92,7 @@ impl ServiceManager { ServiceManagerBuilder::new() } - pub async fn manages_service(&self, service_id: &str) -> bool - { + pub async fn manages_service(&self, service_id: &str) -> bool { for service in self.services.iter() { let service_lock = service.lock().await; @@ -99,7 +104,10 @@ impl ServiceManager { false } - pub async fn start_service(&self, service: Arc>) -> Result<(), StartupError> { + pub async fn start_service( + &self, + service: Arc>, + ) -> Result<(), StartupError> { let service_id = service.lock().await.info().id.clone(); if !self.manages_service(&service_id).await { return Err(StartupError::ServiceNotManaged(service_id.clone())); @@ -113,13 +121,18 @@ impl ServiceManager { } if self.has_background_task_registered(&service_id).await { - return Err(StartupError::BackgroundTaskAlreadyRunning(service_id.clone())); + return Err(StartupError::BackgroundTaskAlreadyRunning( + service_id.clone(), + )); } let service_status_event = service_lock.info().status.as_ref(); let attachment_result = self.on_status_change.attach(service_status_event, 2).await; if let Err(err) = attachment_result { - return Err(StartupError::StatusAttachmentFailed(service_id.clone(), err)); + return Err(StartupError::StatusAttachmentFailed( + service_id.clone(), + err, + )); } service_lock.info().status.set(Status::Starting).await; @@ -133,7 +146,10 @@ impl ServiceManager { } //TODO: Clean up - pub async fn stop_service(&self, service: Arc>) -> Result<(), ShutdownError> { + pub async fn stop_service( + &self, + service: Arc>, + ) -> Result<(), ShutdownError> { let service_id = service.lock().await.info().id.clone(); if !(self.manages_service(&service_id).await) { return Err(ShutdownError::ServiceNotManaged(service_id.clone())); @@ -155,7 +171,10 @@ impl ServiceManager { let service_status_event = service_lock.info().status.as_ref(); let detach_result = self.on_status_change.detach(service_status_event).await; if let Err(err) = detach_result { - return Err(ShutdownError::StatusDetachmentFailed(service_id.clone(), err)); + return Err(ShutdownError::StatusDetachmentFailed( + service_id.clone(), + err, + )); } info!("Stopped service {}", service_lock.info().name); @@ -305,7 +324,7 @@ impl ServiceManager { .map(|line| line.len()) .max() .unwrap_or(0); - + let mut headline = String::from("Status overview\n"); headline.push_str("─".repeat(longest_width).as_str()); headline.push('\n'); @@ -322,7 +341,10 @@ impl ServiceManager { Some(weak) => weak, None => { error!("ServiceManager's Weak self-reference was None while initializing service {}. This should never happen. Did you not use a ServiceManagerBuilder? Shutting down ungracefully to prevent further undefined behavior.", service.info().name); - unreachable!("ServiceManager's Weak self-reference was None while initializing service {}.", service.info().name); + unreachable!( + "ServiceManager's Weak self-reference was None while initializing service {}.", + service.info().name + ); } }; @@ -335,7 +357,6 @@ impl ServiceManager { } }; - //TODO: Add to config instead of hardcoding duration let start = service.start(arc); let timeout_result = timeout(Duration::from_secs(10), start).await; @@ -351,7 +372,9 @@ impl ServiceManager { .status .set(Status::FailedToStart(error.to_string())) .await; - return Err(StartupError::FailedToStartService(service.info().id.clone())); + return Err(StartupError::FailedToStartService( + service.info().id.clone(), + )); } }, Err(error) => { @@ -360,7 +383,9 @@ impl ServiceManager { .status .set(Status::FailedToStart(error.to_string())) .await; - return Err(StartupError::FailedToStartService(service.info().id.clone())); + return Err(StartupError::FailedToStartService( + service.info().id.clone(), + )); } } @@ -386,7 +411,9 @@ impl ServiceManager { .status .set(Status::FailedToStop(error.to_string())) .await; - return Err(ShutdownError::FailedToStopService(service.info().id.clone())); + return Err(ShutdownError::FailedToStopService( + service.info().id.clone(), + )); } }, Err(error) => { @@ -395,7 +422,9 @@ impl ServiceManager { .status .set(Status::FailedToStop(error.to_string())) .await; - return Err(ShutdownError::FailedToStopService(service.info().id.clone())); + return Err(ShutdownError::FailedToStopService( + service.info().id.clone(), + )); } } @@ -412,7 +441,10 @@ impl ServiceManager { service_lock: &MutexGuard<'_, dyn Service>, service: Arc>, ) { - if self.has_background_task_registered(&service_lock.info().id).await { + if self + .has_background_task_registered(&service_lock.info().id) + .await + { return; } @@ -433,14 +465,14 @@ impl ServiceManager { "Background task of service {} ended unexpectedly! Service will be marked as failed.", service.info().name ); - + service .info() .status .set(Status::RuntimeError("Background task ended unexpectedly!".to_string())) .await; } - + Err(error) => { error!( "Background task of service {} ended with error: {}. Service will be marked as failed.", @@ -470,7 +502,10 @@ impl ServiceManager { } async fn stop_background_task(&self, service_lock: &MutexGuard<'_, dyn Service>) { - if !self.has_background_task_registered(&service_lock.info().id).await { + if !self + .has_background_task_registered(&service_lock.info().id) + .await + { return; } diff --git a/src/service/types.rs b/src/service/types.rs index 70c383c..5f1e220 100644 --- a/src/service/types.rs +++ b/src/service/types.rs @@ -15,7 +15,8 @@ pub type PinnedBoxedFuture = Pin + Send + Sync>>; pub type PinnedBoxedFutureResult = PinnedBoxedFuture>; pub type LifetimedPinnedBoxedFuture<'a, T> = Pin + Send + Sync + 'a>>; -pub type LifetimedPinnedBoxedFutureResult<'a, T> = LifetimedPinnedBoxedFuture<'a, Result>; +pub type LifetimedPinnedBoxedFutureResult<'a, T> = + LifetimedPinnedBoxedFuture<'a, Result>; #[derive(Debug, Clone)] pub enum Status { From 58ee540dbcb1db8838bc545f46c942108a3a7fdf Mon Sep 17 00:00:00 2001 From: Torben Schweren Date: Sat, 5 Oct 2024 23:42:22 +0200 Subject: [PATCH 7/7] fix: bump version to 0.3.0 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f0e3c1..0fe18e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1180,7 +1180,7 @@ dependencies = [ [[package]] name = "lum" -version = "0.2.1" +version = "0.3.0" dependencies = [ "async-trait", "dirs", diff --git a/Cargo.toml b/Cargo.toml index 673bf69..88095c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lum" -version = "0.2.1" +version = "0.3.0" authors = ["Torben Schweren"] edition = "2021" rust-version = "1.80.0"