Flatten out utils contents

gearbot · Oct 18, 2020 · d1dead1 · d1dead1
1 parent d1e674c
commit d1dead1
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/src/util/config.rs → src/config.rs b/src/util/config.rs → src/config.rs
@@ -1,4 +1,4 @@
-use crate::util::error::StartupError;
+use crate::error::StartupError;
 use serde::Deserialize;
 use std::fs;
 

diff --git a/src/util/error.rs → src/error.rs b/src/util/error.rs → src/error.rs
diff --git a/src/main.rs b/src/main.rs
@@ -1,7 +1,7 @@
+use crate::config::ApiConfig;
+use crate::error::{RequestError, StartupError};
 use crate::redis::redis_link::RedisLink;
 use crate::routes::{hello_world, not_found, team_info, ws};
-use crate::util::config::ApiConfig;
-use crate::util::error::{RequestError, StartupError};
 use flexi_logger::{colored_opt_format, Age, Cleanup, Criterion, Duplicate, Logger, Naming};
 use hyper::header::ACCESS_CONTROL_ALLOW_ORIGIN;
 use hyper::service::{make_service_fn, service_fn};
@@ -12,9 +12,10 @@ use std::env;
 use std::net::SocketAddr;
 use std::sync::Arc;
 
+mod config;
+mod error;
 mod redis;
 mod routes;
-mod util;
 
 pub struct ApiContext {
     pub config: ApiConfig,

diff --git a/src/redis/redis_link.rs b/src/redis/redis_link.rs
@@ -1,6 +1,6 @@
+use crate::config::ApiConfig;
+use crate::error::{CommunicationError, StartupError};
 use crate::redis::{GearBotRequest, Reply, ReplyData, Request, TeamInfo};
-use crate::util::config::ApiConfig;
-use crate::util::error::{CommunicationError, StartupError};
 use darkredis::{Connection, ConnectionPool};
 use futures_util::StreamExt;
 use tokio::sync::broadcast;

diff --git a/src/routes/hello.rs b/src/routes/hello.rs
@@ -1,4 +1,4 @@
-use crate::util::error::RequestError;
+use crate::error::RequestError;
 use hyper::{Body, Response};
 
 pub async fn hello_world() -> Result<Response<Body>, RequestError> {

diff --git a/src/routes/mod.rs b/src/routes/mod.rs
@@ -7,7 +7,7 @@ pub use team::team_info;
 mod ws;
 pub use ws::ws;
 
-use crate::util::error::RequestError;
+use crate::error::RequestError;
 use hyper::{Body, Response, StatusCode};
 
 pub fn not_found() -> Result<Response<Body>, RequestError> {

diff --git a/src/routes/team.rs b/src/routes/team.rs
@@ -1,4 +1,4 @@
-use crate::util::error::RequestError;
+use crate::error::RequestError;
 use crate::ApiContext;
 use hyper::{Body, Response};
 use std::sync::Arc;

diff --git a/src/routes/ws.rs b/src/routes/ws.rs
@@ -1,4 +1,4 @@
-use crate::util::error::{BadRequestError, RequestError};
+use crate::error::{BadRequestError, RequestError};
 use crate::ApiContext;
 use futures_util::StreamExt;
 use hyper::header::{HeaderValue, CONNECTION, SEC_WEBSOCKET_ACCEPT, SEC_WEBSOCKET_KEY, UPGRADE};

diff --git a/src/util/mod.rs b/src/util/mod.rs