Fix: proper formatting

samparsky · samparsky · commit f55119b3aad3 · 2019-11-20T10:48:15.000+01:00
diff --git a/sentry/src/lib.rs b/sentry/src/lib.rs
@@ -106,7 +106,7 @@ impl<A: Adapter + 'static> Application<A> {
                 return map_response_error(ResponseError::BadRequest("invalid auth".into()));
             }
         };
-        
+
         let mut response = match (req.uri().path(), req.method()) {
             ("/cfg", &Method::GET) => config(req, &self).await,
             ("/channel", &Method::POST) => create_channel(req, &self).await,
@@ -187,7 +187,9 @@ pub fn bad_response(response_body: String) -> Response<Body> {
     let body = Body::from(serde_json::to_string(&error_response).expect("serialise err response"));
 
     let mut response = Response::new(body);
-    response.headers_mut().insert("Content-type", "application/json".parse().unwrap());
+    response
+        .headers_mut()
+        .insert("Content-type", "application/json".parse().unwrap());
 
     let status = response.status_mut();
     *status = StatusCode::BAD_REQUEST;
@@ -199,7 +201,9 @@ pub fn success_response(response_body: String) -> Response<Body> {
     let body = Body::from(response_body);
 
     let mut response = Response::new(body);
-    response.headers_mut().insert("Content-type", "application/json".parse().unwrap());
+    response
+        .headers_mut()
+        .insert("Content-type", "application/json".parse().unwrap());
 
     let status = response.status_mut();
     *status = StatusCode::OK;
diff --git a/sentry/src/routes/channel.rs b/sentry/src/routes/channel.rs
@@ -1,18 +1,21 @@
 use self::channel_list::ChannelListQuery;
 use crate::middleware::channel::get_channel;
+use crate::success_response;
 use crate::Application;
 use crate::ResponseError;
 use crate::RouteParams;
 use futures::TryStreamExt;
 use hex::FromHex;
 use hyper::{Body, Request, Response};
 use primitives::adapter::Adapter;
+use primitives::sentry::SuccessResponse;
 use primitives::{Channel, ChannelId};
-use primitives::sentry::{SuccessResponse};
-use slog::{error};
-use crate::success_response;
+use slog::error;
 
-pub async fn create_channel<A: Adapter>(req: Request<Body>, app: &Application<A>) -> Result<Response<Body>, ResponseError> {
+pub async fn create_channel<A: Adapter>(
+    req: Request<Body>,
+    app: &Application<A>,
+) -> Result<Response<Body>, ResponseError> {
     let body = req.into_body().try_concat().await?;
 
     let channel = serde_json::from_slice::<Channel>(&body)?;
@@ -37,15 +40,15 @@ pub async fn create_channel<A: Adapter>(req: Request<Body>, app: &Application<A>
             }
         })
         .await;
-    
+
     if let Err(err) = result {
         error!(&app.logger, "{}", &err; "module" => "create_channel");
-        return Err(ResponseError::BadRequest("err occured; please try again later".into()));
+        return Err(ResponseError::BadRequest(
+            "err occured; please try again later".into(),
+        ));
     }
-    
-    let create_response = SuccessResponse {
-        success: true,
-    };
+
+    let create_response = SuccessResponse { success: true };
 
     Ok(success_response(serde_json::to_string(&create_response)?))
 }
@@ -54,16 +57,18 @@ pub async fn channel_list(req: Request<Body>) -> Result<Response<Body>, Response
     // @TODO: Get from Config
     let _channel_find_limit = 5;
 
-    let query =
-        serde_urlencoded::from_str::<ChannelListQuery>(&req.uri().query().unwrap_or(""))?;
+    let query = serde_urlencoded::from_str::<ChannelListQuery>(&req.uri().query().unwrap_or(""))?;
 
     // @TODO: List all channels returned from the DB
     println!("{:?}", query);
 
     Err(ResponseError::NotFound)
 }
 
-pub async fn last_approved<A: Adapter>(req: Request<Body>, app: &Application<A>) -> Result<Response<Body>, ResponseError> {
+pub async fn last_approved<A: Adapter>(
+    req: Request<Body>,
+    app: &Application<A>,
+) -> Result<Response<Body>, ResponseError> {
     // get request params
     let route_params = req
         .extensions()
@@ -78,7 +83,6 @@ pub async fn last_approved<A: Adapter>(req: Request<Body>, app: &Application<A>)
         .unwrap())
 }
 
-
 mod channel_list {
     use chrono::{DateTime, Utc};
     use serde::{Deserialize, Deserializer};
