Automatically reorder imports to my preferred style.

7 files changed, 12 insertions, 11 deletions

diff --git a/rustfmt.toml b/rustfmt.toml
index 26527d9..0a2eec8 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -3,3 +3,4 @@
 #
 # Yes, this is why the `check-format` and `reformat` tools use `+nightly`.
 imports_granularity = "crate"
+group_imports = "StdExternalCrate"
diff --git a/src/app.rs b/src/app.rs
index d0ffcc0..e61672f 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,5 +1,7 @@
 use sqlx::sqlite::SqlitePool;
 
+#[cfg(test)]
+use crate::user::app::Users;
 use crate::{
     boot::app::Boot,
     conversation::app::Conversations,
@@ -11,9 +13,6 @@ use crate::{
     token::{self, app::Tokens},
 };
 
-#[cfg(test)]
-use crate::user::app::Users;
-
 #[derive(Clone)]
 pub struct App {
     db: SqlitePool,
diff --git a/src/login/mod.rs b/src/login/mod.rs
index bccc2af..379300e 100644
--- a/src/login/mod.rs
+++ b/src/login/mod.rs
@@ -3,9 +3,10 @@ pub mod handlers;
 mod id;
 pub mod repo;
 
-use crate::name::Name;
 pub use id::Id;
 
+use crate::name::Name;
+
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 pub struct Login {
     pub id: Id,
diff --git a/src/main.rs b/src/main.rs
index b8981d0..f140da1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,4 @@
 use clap::Parser;
-
 use pilcrow::cli;
 
 #[tokio::main]
diff --git a/src/message/snapshot.rs b/src/message/snapshot.rs
index 19a98a3..dc863c9 100644
--- a/src/message/snapshot.rs
+++ b/src/message/snapshot.rs
@@ -1,9 +1,10 @@
+use serde_with::with_prefix;
+
 use super::{
     Body, Id,
     event::{Event, Sent},
 };
 use crate::{conversation, event::Instant, user};
-use serde_with::with_prefix;
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 pub struct Message {
diff --git a/src/setup/required.rs b/src/setup/required.rs
index 7276827..a2aed18 100644
--- a/src/setup/required.rs
+++ b/src/setup/required.rs
@@ -1,12 +1,13 @@
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use axum::{
     extract::Request,
     http::StatusCode,
     response::{IntoResponse, Response},
 };
-use std::{
-    pin::Pin,
-    task::{Context, Poll},
-};
 use tower::{Layer, Service};
 
 use crate::{app::App, error::Internal};
diff --git a/src/token/extract/identity.rs b/src/token/extract/identity.rs
index 960fe60..bee4e31 100644
--- a/src/token/extract/identity.rs
+++ b/src/token/extract/identity.rs
@@ -5,7 +5,6 @@ use axum::{
 };
 
 use super::IdentityCookie;
-
 use crate::{
     app::App,
     clock::RequestedAt,