diff --git a/src/fej/ivago/basic_date.rs b/src/fej/ivago/basic_date.rs index 38c6f6c..bbcae73 100644 --- a/src/fej/ivago/basic_date.rs +++ b/src/fej/ivago/basic_date.rs @@ -1,11 +1,8 @@ use crate::errors::FejError; use chrono::{DateTime, NaiveDate, TimeZone}; -use chrono_tz::Europe::Brussels; -use chrono_tz::Tz; -use rocket::http::RawStr; -use rocket::request::FromFormValue; -use serde::ser::Serializer; -use serde::Serialize; +use chrono_tz::{Europe::Brussels, Tz}; +use rocket::{http::RawStr, request::FromFormValue}; +use serde::{ser::Serializer, Serialize}; use std::convert::TryFrom; /// This class is a simple wrapper around chrono's DateTime. Its sole purpose diff --git a/src/fej/ivago/db.rs b/src/fej/ivago/db.rs index 6ba3174..96f6111 100644 --- a/src/fej/ivago/db.rs +++ b/src/fej/ivago/db.rs @@ -1,8 +1,6 @@ use super::Street; -use crate::errors::FejError; -use crate::schema::ivago_streets::dsl::*; -use diesel::prelude::*; -use diesel::PgConnection; +use crate::{errors::FejError, schema::ivago_streets::dsl::*}; +use {diesel::prelude::*, PgConnection}; pub fn search_streets(db_con: &PgConnection, search_term: &str) -> Result, FejError> { Ok(ivago_streets diff --git a/src/fej/ivago/mod.rs b/src/fej/ivago/mod.rs index a6d8295..b1b7f0c 100644 --- a/src/fej/ivago/mod.rs +++ b/src/fej/ivago/mod.rs @@ -2,8 +2,10 @@ use crate::errors::FejError; use chrono::DateTime; use chrono_tz::Tz; use reqwest::blocking as reqwest; -use std::collections::HashMap; -use std::convert::{From, TryFrom}; +use std::{ + collections::HashMap, + convert::{From, TryFrom}, +}; mod basic_date; pub mod db; diff --git a/src/fej/ivago/street.rs b/src/fej/ivago/street.rs index 4ba45cb..5b0ba30 100644 --- a/src/fej/ivago/street.rs +++ b/src/fej/ivago/street.rs @@ -1,8 +1,7 @@ use crate::schema::ivago_streets; use diesel::{Insertable, Queryable}; use regex::Regex; -use rocket::http::RawStr; -use rocket::request::FromFormValue; +use rocket::{http::RawStr, request::FromFormValue}; use serde::ser::{Serialize, SerializeStruct, Serializer}; use std::convert::TryFrom; diff --git a/src/populate_ivago.rs b/src/populate_ivago.rs index 0886551..29afd39 100644 --- a/src/populate_ivago.rs +++ b/src/populate_ivago.rs @@ -1,6 +1,5 @@ use diesel::{insert_into, Connection, PgConnection, RunQueryDsl}; -use fej::ivago::search_streets; -use fej::schema::ivago_streets::dsl::*; +use fej::{ivago::search_streets, schema::ivago_streets::dsl::*}; const ABC: &str = "abcdefghijklmnopqrstuvwxyz"; diff --git a/src/server/main.rs b/src/server/main.rs index bfe4fef..c2dd19f 100644 --- a/src/server/main.rs +++ b/src/server/main.rs @@ -15,10 +15,11 @@ mod routes; // Very temporary solution for CORS // https://stackoverflow.com/questions/62412361/how-to-set-up-cors-or-options-for-rocket-rs -use rocket::fairing::AdHoc; -use rocket::fairing::{Fairing, Info, Kind}; -use rocket::http::Header; -use rocket::{Request, Response, Rocket}; +use rocket::{ + fairing::{AdHoc, Fairing, Info, Kind}, + http::Header, + Request, Response, Rocket, +}; use rocket_contrib::databases::diesel; #[cfg(feature = "frontend")] use rocket_contrib::serve::StaticFiles; diff --git a/src/server/routes/ivago.rs b/src/server/routes/ivago.rs index e8c0a9e..af025fe 100644 --- a/src/server/routes/ivago.rs +++ b/src/server/routes/ivago.rs @@ -1,6 +1,8 @@ use crate::FejDbConn; -use fej::ivago::db::search_streets; -use fej::ivago::{get_pickup_times, BasicDate, PickupTime, Street}; +use fej::{ + db::search_streets, + ivago::{get_pickup_times, BasicDate, PickupTime, Street}, +}; use rocket::http::Status; use rocket_contrib::json::Json; diff --git a/src/server/tests.rs b/src/server/tests.rs index 8871762..ae96481 100644 --- a/src/server/tests.rs +++ b/src/server/tests.rs @@ -1,6 +1,5 @@ /// In here, any non-unit tests are placed. -use rocket::http::Status; -use rocket::local::Client; +use rocket::{http::Status, local::Client}; fn rocket() -> rocket::Rocket { rocket::ignite().mount("/", super::routes::ivago())