From 5d76d0712e07040d9aeeebccb189d75636a07c7a Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Thu, 12 Sep 2024 00:31:08 -0400
Subject: Consolidate the (now) two definitions of DateTime.

---
 src/clock.rs             | 6 ++++--
 src/login/app.rs         | 4 +---
 src/login/repo/tokens.rs | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/clock.rs b/src/clock.rs
index 84fcaf6..7757925 100644
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -4,14 +4,16 @@ use axum::{
     middleware::Next,
     response::Response,
 };
-use chrono::{DateTime, Utc};
+use chrono::Utc;
+
+pub type DateTime = chrono::DateTime<chrono::Utc>;
 
 /// Extractor that provides the "current time" for a request. This time is calculated
 /// once per request, even if the extractor is used in multiple places. This requires
 /// the [middleware] function to be installed with [axum::middleware::from_fn] around
 /// the current route.
 #[derive(Clone)]
-pub struct RequestedAt(pub DateTime<Utc>);
+pub struct RequestedAt(pub DateTime);
 
 impl RequestedAt {
     fn now() -> Self {
diff --git a/src/login/app.rs b/src/login/app.rs
index ced76d6..85fa024 100644
--- a/src/login/app.rs
+++ b/src/login/app.rs
@@ -7,9 +7,7 @@ use super::repo::{
     logins::{Login, Provider as _},
     tokens::Provider as _,
 };
-use crate::error::BoxedError;
-
-type DateTime = chrono::DateTime<chrono::Utc>;
+use crate::{clock::DateTime, error::BoxedError};
 
 pub struct Logins<'a> {
     db: &'a SqlitePool,
diff --git a/src/login/repo/tokens.rs b/src/login/repo/tokens.rs
index 39505f1..2e46186 100644
--- a/src/login/repo/tokens.rs
+++ b/src/login/repo/tokens.rs
@@ -3,9 +3,7 @@ use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
 use uuid::Uuid;
 
 use super::logins::{Id as LoginId, Login};
-use crate::error::BoxedError;
-
-type DateTime = chrono::DateTime<chrono::Utc>;
+use crate::{clock::DateTime, error::BoxedError};
 
 pub trait Provider {
     fn tokens(&mut self) -> Tokens;
-- 
cgit v1.2.3