From 7635af88cd4a87f79acde71abd8d53266a0af1e2 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Mon, 7 Aug 2023 14:51:26 +0200
Subject: [PATCH] Move util module to server module

---
 src/main.rs                   | 1 -
 src/server.rs                 | 1 +
 src/server/recurring/queue.rs | 2 +-
 src/server/recurring/repo.rs  | 2 +-
 src/{ => server}/util.rs      | 0
 src/server/web/commit_hash.rs | 2 +-
 src/server/web/index.rs       | 2 +-
 src/server/web/queue.rs       | 2 +-
 src/server/web/queue_id.rs    | 2 +-
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{ => server}/util.rs (100%)

diff --git a/src/main.rs b/src/main.rs
index d05487f..cbb1e06 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,6 @@ mod args;
 mod config;
 mod server;
 mod somehow;
-mod util;
 
 use std::{io, path::PathBuf, process};
 
diff --git a/src/server.rs b/src/server.rs
index a9c78c5..a14681d 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,4 +1,5 @@
 mod recurring;
+mod util;
 mod web;
 
 use std::{path::Path, sync::Arc, time::Duration};
diff --git a/src/server/recurring/queue.rs b/src/server/recurring/queue.rs
index cc6c245..d526ff0 100644
--- a/src/server/recurring/queue.rs
+++ b/src/server/recurring/queue.rs
@@ -2,7 +2,7 @@ use sqlx::{Acquire, SqlitePool};
 use time::OffsetDateTime;
 use tracing::debug;
 
-use crate::{somehow, util};
+use crate::{server::util, somehow};
 
 pub async fn update(db: &SqlitePool) -> somehow::Result<()> {
     debug!("Updating queue");
diff --git a/src/server/recurring/repo.rs b/src/server/recurring/repo.rs
index 27242db..03fea48 100644
--- a/src/server/recurring/repo.rs
+++ b/src/server/recurring/repo.rs
@@ -9,7 +9,7 @@ use gix::{
 use sqlx::{Acquire, SqliteConnection, SqlitePool};
 use tracing::{debug, info};
 
-use crate::{somehow, util};
+use crate::{server::util, somehow};
 
 async fn get_all_commit_hashes_from_db(
     conn: &mut SqliteConnection,
diff --git a/src/util.rs b/src/server/util.rs
similarity index 100%
rename from src/util.rs
rename to src/server/util.rs
diff --git a/src/server/web/commit_hash.rs b/src/server/web/commit_hash.rs
index 6102797..e8a11ea 100644
--- a/src/server/web/commit_hash.rs
+++ b/src/server/web/commit_hash.rs
@@ -7,7 +7,7 @@ use axum::{
 use futures::TryStreamExt;
 use sqlx::SqlitePool;
 
-use crate::{config::Config, somehow, util};
+use crate::{config::Config, server::util, somehow};
 
 use super::{Base, Tab};
 
diff --git a/src/server/web/index.rs b/src/server/web/index.rs
index 7d5a221..71ec780 100644
--- a/src/server/web/index.rs
+++ b/src/server/web/index.rs
@@ -3,7 +3,7 @@ use axum::{extract::State, response::IntoResponse};
 use futures::TryStreamExt;
 use sqlx::SqlitePool;
 
-use crate::{config::Config, somehow, util};
+use crate::{config::Config, server::util, somehow};
 
 use super::{Base, Tab};
 
diff --git a/src/server/web/queue.rs b/src/server/web/queue.rs
index 6d4aa61..a107ad8 100644
--- a/src/server/web/queue.rs
+++ b/src/server/web/queue.rs
@@ -3,7 +3,7 @@ use axum::{extract::State, response::IntoResponse};
 use futures::TryStreamExt;
 use sqlx::SqlitePool;
 
-use crate::{config::Config, somehow, util};
+use crate::{config::Config, server::util, somehow};
 
 use super::{Base, Tab};
 
diff --git a/src/server/web/queue_id.rs b/src/server/web/queue_id.rs
index 77ced5d..acdd086 100644
--- a/src/server/web/queue_id.rs
+++ b/src/server/web/queue_id.rs
@@ -6,7 +6,7 @@ use axum::{
 };
 use sqlx::SqlitePool;
 
-use crate::{config::Config, somehow, util};
+use crate::{config::Config, server::util, somehow};
 
 use super::{Base, Tab};