Format the changes from merge to master

src/api/admin.rs

@@ -3,7 +3,6 @@ use serde::de::DeserializeOwned;
 use serde_json::Value;
 use std::{env, time::Duration};
 
-
 use rocket::{
     http::{Cookie, Cookies, SameSite},
     request::{self, FlashMessage, Form, FromRequest, Outcome, Request},
@@ -19,7 +18,7 @@ use crate::{
     db::{backup_database, get_sql_server_version, models::*, DbConn, DbConnType},
     error::{Error, MapResult},
     mail,
-    util::{format_naive_datetime_local, get_display_size, is_running_in_docker, get_reqwest_client},
+    util::{format_naive_datetime_local, get_display_size, get_reqwest_client, is_running_in_docker},
     CONFIG,
 };
 
@@ -471,22 +470,13 @@ struct GitCommit {
 fn get_github_api<T: DeserializeOwned>(url: &str) -> Result<T, Error> {
     let github_api = get_reqwest_client();
 
-    Ok(github_api
+    Ok(github_api.get(url).timeout(Duration::from_secs(10)).send()?.error_for_status()?.json::<T>()?)
-        .get(url)
-        .timeout(Duration::from_secs(10))
-        .send()?
-        .error_for_status()?
-        .json::<T>()?)
 }
 
 fn has_http_access() -> bool {
     let http_access = get_reqwest_client();
 
-    match http_access
+    match http_access.head("https://github.com/dani-garcia/bitwarden_rs").timeout(Duration::from_secs(10)).send() {
-        .head("https://github.com/dani-garcia/bitwarden_rs")
-        .timeout(Duration::from_secs(10))
-        .send()
-    {
         Ok(r) => r.status().is_success(),
         _ => false,
     }

src/api/core/two_factor/duo.rs

@@ -204,7 +204,8 @@ fn duo_api_request(method: &str, path: &str, params: &str, data: &DuoData) -> Em
 
     let client = get_reqwest_client();
 
-    client.request(m, &url)
+    client
+        .request(m, &url)
         .basic_auth(username, Some(password))
         .header(header::USER_AGENT, "bitwarden_rs:Duo/1.0 (Rust)")
         .header(header::DATE, date)

src/api/icons.rs

@@ -12,7 +12,11 @@ use regex::Regex;
 use reqwest::{blocking::Client, blocking::Response, header, Url};
 use rocket::{http::ContentType, http::Cookie, response::Content, Route};
 
-use crate::{error::Error, util::{Cached, get_reqwest_client_builder}, CONFIG};
+use crate::{
+    error::Error,
+    util::{get_reqwest_client_builder, Cached},
+    CONFIG,
+};
 
 pub fn routes() -> Vec<Route> {
     routes![icon]

src/util.rs

@@ -523,7 +523,10 @@ where
     }
 }
 
-use reqwest::{blocking::{Client, ClientBuilder}, header};
+use reqwest::{
+    blocking::{Client, ClientBuilder},
+    header,
+};
 
 pub fn get_reqwest_client() -> Client {
     get_reqwest_client_builder().build().expect("Failed to build client")
@@ -532,8 +535,5 @@ pub fn get_reqwest_client() -> Client {
 pub fn get_reqwest_client_builder() -> ClientBuilder {
     let mut headers = header::HeaderMap::new();
     headers.insert(header::USER_AGENT, header::HeaderValue::from_static("Bitwarden_RS"));
-    Client::builder()
+    Client::builder().default_headers(headers).timeout(Duration::from_secs(10))
-        .default_headers(headers)
-        .timeout(Duration::from_secs(10))
-
 }