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>
This commit is contained in:
bors[bot] 2021-06-30 11:55:30 +00:00 committed by GitHub
commit eeca841a21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 33 additions and 20 deletions

View File

@ -65,3 +65,17 @@ jobs:
with: with:
command: clippy command: clippy
args: --all-targets -- --deny warnings 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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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