run cargo fix for rust 2024 changes and rustfmt

Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>

src/database/engine/backup.rs

@@ -1,6 +1,6 @@
 use std::fmt::Write;
 
-use conduwuit::{error, implement, info, utils::time::rfc2822_from_seconds, warn, Result};
+use conduwuit::{Result, error, implement, info, utils::time::rfc2822_from_seconds, warn};
 use rocksdb::backup::{BackupEngine, BackupEngineOptions};
 
 use super::Engine;

src/database/engine/cf_opts.rs

@@ -1,4 +1,4 @@
-use conduwuit::{err, utils::math::Expected, Config, Result};
+use conduwuit::{Config, Result, err, utils::math::Expected};
 use rocksdb::{
 	BlockBasedIndexType, BlockBasedOptions, BlockBasedPinningTier, Cache,
 	DBCompressionType as CompressionType, DataBlockIndexType, LruCacheOptions, Options,
@@ -6,7 +6,7 @@ use rocksdb::{
 };
 
 use super::descriptor::{CacheDisp, Descriptor};
-use crate::{util::map_err, Context};
+use crate::{Context, util::map_err};
 
 pub(super) const SENTINEL_COMPRESSION_LEVEL: i32 = 32767;
 

src/database/engine/context.rs

@@ -3,7 +3,7 @@ use std::{
 	sync::{Arc, Mutex},
 };
 
-use conduwuit::{debug, utils::math::usize_from_f64, Result, Server};
+use conduwuit::{Result, Server, debug, utils::math::usize_from_f64};
 use rocksdb::{Cache, Env, LruCacheOptions};
 
 use crate::{or_else, pool::Pool};

src/database/engine/db_opts.rs

@@ -1,7 +1,7 @@
 use std::{cmp, convert::TryFrom};
 
-use conduwuit::{utils, Config, Result};
-use rocksdb::{statistics::StatsLevel, Cache, DBRecoveryMode, Env, LogLevel, Options};
+use conduwuit::{Config, Result, utils};
+use rocksdb::{Cache, DBRecoveryMode, Env, LogLevel, Options, statistics::StatsLevel};
 
 use super::{cf_opts::cache_size_f64, logger::handle as handle_log};
 

src/database/engine/files.rs

@@ -1,11 +1,11 @@
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use rocksdb::LiveFile as SstFile;
 
 use super::Engine;
 use crate::util::map_err;
 
 #[implement(Engine)]
-pub fn file_list(&self) -> impl Iterator<Item = Result<SstFile>> + Send {
+pub fn file_list(&self) -> impl Iterator<Item = Result<SstFile>> + Send + use<> {
 	self.db
 		.live_files()
 		.map_err(map_err)

src/database/engine/memory_usage.rs

@@ -1,6 +1,6 @@
 use std::fmt::Write;
 
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use rocksdb::perf::get_memory_usage_stats;
 
 use super::Engine;

src/database/engine/open.rs

@@ -1,20 +1,20 @@
 use std::{
 	collections::BTreeSet,
 	path::Path,
-	sync::{atomic::AtomicU32, Arc},
+	sync::{Arc, atomic::AtomicU32},
 };
 
-use conduwuit::{debug, implement, info, warn, Result};
+use conduwuit::{Result, debug, implement, info, warn};
 use rocksdb::{ColumnFamilyDescriptor, Options};
 
 use super::{
+	Db, Engine,
 	cf_opts::cf_options,
 	db_opts::db_options,
 	descriptor::{self, Descriptor},
 	repair::repair,
-	Db, Engine,
 };
-use crate::{or_else, Context};
+use crate::{Context, or_else};
 
 #[implement(Engine)]
 #[tracing::instrument(skip_all)]

src/database/engine/repair.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use conduwuit::{info, warn, Err, Result};
+use conduwuit::{Err, Result, info, warn};
 use rocksdb::Options;
 
 use super::Db;