run cargo fix for rust 2024 changes and rustfmt

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

src/core/log/capture/data.rs

@@ -1,7 +1,7 @@
 use tracing::Level;
-use tracing_core::{span::Current, Event};
+use tracing_core::{Event, span::Current};
 
-use super::{layer::Value, Layer};
+use super::{Layer, layer::Value};
 use crate::{info, utils::string::EMPTY};
 
 pub struct Data<'a> {

src/core/log/capture/util.rs

@@ -1,7 +1,7 @@
 use std::sync::{Arc, Mutex};
 
 use super::{
-	super::{fmt, Level},
+	super::{Level, fmt},
 	Closure, Data,
 };
 use crate::Result;

src/core/log/console.rs

@@ -1,20 +1,20 @@
 use std::{env, io, sync::LazyLock};
 
 use tracing::{
-	field::{Field, Visit},
 	Event, Level, Subscriber,
+	field::{Field, Visit},
 };
 use tracing_subscriber::{
 	field::RecordFields,
 	fmt,
 	fmt::{
-		format::{Compact, DefaultVisitor, Format, Full, Pretty, Writer},
 		FmtContext, FormatEvent, FormatFields, MakeWriter,
+		format::{Compact, DefaultVisitor, Format, Full, Pretty, Writer},
 	},
 	registry::LookupSpan,
 };
 
-use crate::{apply, Config, Result};
+use crate::{Config, Result, apply};
 
 static SYSTEMD_MODE: LazyLock<bool> =
 	LazyLock::new(|| env::var("SYSTEMD_EXEC_PID").is_ok() && env::var("JOURNAL_STREAM").is_ok());

src/core/log/fmt.rs

@@ -1,6 +1,6 @@
 use std::fmt::Write;
 
-use super::{color, Level};
+use super::{Level, color};
 use crate::Result;
 
 pub fn html<S>(out: &mut S, level: &Level, span: &str, msg: &str) -> Result<()>

src/core/log/mod.rs

@@ -9,7 +9,7 @@ mod reload;
 mod suppress;
 
 pub use capture::Capture;
-pub use console::{is_systemd_mode, ConsoleFormat, ConsoleWriter};
+pub use console::{ConsoleFormat, ConsoleWriter, is_systemd_mode};
 pub use reload::{LogLevelReloadHandles, ReloadHandle};
 pub use suppress::Suppress;
 pub use tracing::Level;
@@ -34,7 +34,7 @@ pub struct Log {
 
 #[macro_export]
 macro_rules! event {
-	( $level:expr, $($x:tt)+ ) => { ::tracing::event!( $level, $($x)+ ) }
+	( $level:expr_2021, $($x:tt)+ ) => { ::tracing::event!( $level, $($x)+ ) }
 }
 
 #[macro_export]

src/core/log/reload.rs

@@ -3,9 +3,9 @@ use std::{
 	sync::{Arc, Mutex},
 };
 
-use tracing_subscriber::{reload, EnvFilter};
+use tracing_subscriber::{EnvFilter, reload};
 
-use crate::{error, Result};
+use crate::{Result, error};
 
 /// We need to store a reload::Handle value, but can't name it's type explicitly
 /// because the S type parameter depends on the subscriber's previous layers. In