Merge branch 'main' into prop/preserve-state

3 files changed, 9 insertions, 9 deletions

diff --git a/src/invite/app.rs b/src/invite/app.rs
index d4e877a..c56c9b3 100644
--- a/src/invite/app.rs
+++ b/src/invite/app.rs
@@ -1,17 +1,17 @@
 use chrono::TimeDelta;
 use sqlx::sqlite::SqlitePool;
 
-use super::{repo::Provider as _, Id, Invite, Summary};
+use super::{Id, Invite, Summary, repo::Provider as _};
 use crate::{
     clock::DateTime,
     db::{Duplicate as _, NotFound as _},
     event::Broadcaster,
     login::{
-        create::{self, Create},
         Login, Password,
+        create::{self, Create},
     },
     name::Name,
-    token::{repo::Provider as _, Secret},
+    token::{Secret, repo::Provider as _},
 };
 
 pub struct Invites<'a> {
diff --git a/src/invite/repo.rs b/src/invite/repo.rs
index 5f86e49..c1dc701 100644
--- a/src/invite/repo.rs
+++ b/src/invite/repo.rs
@@ -1,4 +1,4 @@
-use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
+use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite};
 
 use super::{Id, Invite, Summary};
 use crate::{
@@ -11,7 +11,7 @@ pub trait Provider {
     fn invites(&mut self) -> Invites;
 }
 
-impl<'c> Provider for Transaction<'c, Sqlite> {
+impl Provider for Transaction<'_, Sqlite> {
     fn invites(&mut self) -> Invites {
         Invites(self)
     }
@@ -19,7 +19,7 @@ impl<'c> Provider for Transaction<'c, Sqlite> {
 
 pub struct Invites<'t>(&'t mut SqliteConnection);
 
-impl<'c> Invites<'c> {
+impl Invites<'_> {
     pub async fn create(
         &mut self,
         issuer: &Login,
diff --git a/src/invite/routes/mod.rs b/src/invite/routes/mod.rs
index 2f7375c..d83efc6 100644
--- a/src/invite/routes/mod.rs
+++ b/src/invite/routes/mod.rs
@@ -1,6 +1,6 @@
 use axum::{
-    routing::{get, post},
     Router,
+    routing::{get, post},
 };
 
 use crate::app::App;
@@ -13,6 +13,6 @@ mod test;
 pub fn router() -> Router<App> {
     Router::new()
         .route("/api/invite", post(post::handler))
-        .route("/api/invite/:invite", get(invite::get::handler))
-        .route("/api/invite/:invite", post(invite::post::handler))
+        .route("/api/invite/{invite}", get(invite::get::handler))
+        .route("/api/invite/{invite}", post(invite::post::handler))
 }