Merge #259

259: Run rustfmt one the whole project and add it to the CI r=curquiza a=irevoire

Since there is currently no other PR modifying the code, I think it's a good time to reformat everything and add rustfmt to the ci.

Co-authored-by: Tamo <tamo@meilisearch.com>

.github/workflows/rust.yml

@@ -65,3 +65,17 @@ jobs:
         with:
           command: clippy
           args: --all-targets -- --deny warnings
+
+  fmt:
+    name: Run Rustfmt
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: rustfmt
+      - name: Run cargo fmt
+        run: cargo fmt --all -- --check

bors.toml

@@ -2,7 +2,8 @@ status = [
     'Tests on ubuntu-18.04',
     'Tests on macos-latest',
     'Cargo check on Windows',
-    'Run Clippy'
+    'Run Clippy',
+    'Run Rustfmt'
 ]
 # 3 hours timeout
 timeout-sec = 10800

meilisearch-http/src/extractors/authentication/error.rs

@@ -23,4 +23,3 @@ impl ErrorCode for AuthenticationError {
         }
     }
 }
-

meilisearch-http/src/index_controller/update_actor/actor.rs

@@ -6,7 +6,7 @@ use std::sync::Arc;
 
 use async_stream::stream;
 use futures::StreamExt;
-use log::{trace};
+use log::trace;
 use oxidized_json_checker::JsonChecker;
 use tokio::fs;
 use tokio::io::AsyncWriteExt;

meilisearch-http/src/routes/document.rs

@@ -33,16 +33,16 @@ guard_content_type!(guard_json, "application/json");
 */
 
 fn guard_json(head: &actix_web::dev::RequestHead) -> bool {
-            if let Some(content_type) = head.headers.get("Content-Type") {
+    if let Some(content_type) = head.headers.get("Content-Type") {
-                content_type
+        content_type
-                    .to_str()
+            .to_str()
-                    .map(|v| v.contains("application/json"))
+            .map(|v| v.contains("application/json"))
-                    .unwrap_or(false)
+            .unwrap_or(false)
-            } else {
+    } else {
-                // if no content-type is specified we still accept the data as json!
+        // if no content-type is specified we still accept the data as json!
-                true
+        true
-            }
+    }
-        }
+}
 
 #[derive(Deserialize)]
 struct DocumentParam {

meilisearch-http/src/routes/dump.rs

@@ -1,5 +1,5 @@
-use log::debug;
 use actix_web::{web, HttpResponse};
+use log::debug;
 use serde::{Deserialize, Serialize};
 
 use crate::error::ResponseError;

meilisearch-http/src/routes/index.rs

@@ -21,12 +21,11 @@ pub fn services(cfg: &mut web::ServiceConfig) {
             .route(web::delete().to(delete_index)),
     )
     .service(
-        web::resource("/indexes/{index_uid}/updates")
+        web::resource("/indexes/{index_uid}/updates").route(web::get().to(get_all_updates_status)),
-        .route(web::get().to(get_all_updates_status))
     )
     .service(
         web::resource("/indexes/{index_uid}/updates/{update_id}")
-        .route(web::get().to(get_update_status))
+            .route(web::get().to(get_update_status)),
     );
 }
 

meilisearch-http/src/routes/search.rs

@@ -1,7 +1,7 @@
 use std::collections::{BTreeSet, HashSet};
 
-use log::debug;
 use actix_web::{web, HttpResponse};
+use log::debug;
 use serde::Deserialize;
 use serde_json::Value;
 

meilisearch-http/src/routes/settings.rs

@@ -1,5 +1,5 @@
-use log::debug;
 use actix_web::{web, HttpResponse};
+use log::debug;
 
 use crate::extractors::authentication::{policies::*, GuardedData};
 use crate::index::Settings;

meilisearch-http/src/routes/stats.rs

@@ -1,5 +1,5 @@
-use log::debug;
 use actix_web::{web, HttpResponse};
+use log::debug;
 use serde::Serialize;
 
 use crate::error::ResponseError;