mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-10-31 10:18:19 +02:00 
			
		
		
		
	Apply rustfmt.
Because apparently CLion's default formatting is not the same as rustfmt for some reason.
This commit is contained in:
		| @@ -2,20 +2,20 @@ use std::collections::{HashMap, HashSet}; | ||||
|  | ||||
| use chrono::{NaiveDateTime, Utc}; | ||||
| use futures::{stream, stream::StreamExt}; | ||||
| use rocket::fs::TempFile; | ||||
| use rocket::serde::json::Json; | ||||
| use rocket::{ | ||||
|     form::{Form, FromForm}, | ||||
|     Route, | ||||
| }; | ||||
| use rocket::fs::TempFile; | ||||
| use rocket::serde::json::Json; | ||||
| use serde_json::Value; | ||||
|  | ||||
| use crate::{ | ||||
|     api::{self, EmptyResult, JsonResult, JsonUpcase, Notify, PasswordData, UpdateType}, | ||||
|     auth::Headers, | ||||
|     CONFIG, | ||||
|     crypto, | ||||
|     db::{DbConn, DbPool, models::*}, | ||||
|     db::{models::*, DbConn, DbPool}, | ||||
|     CONFIG, | ||||
| }; | ||||
|  | ||||
| use super::folders::FolderData; | ||||
| @@ -805,7 +805,7 @@ async fn share_cipher_by_uuid( | ||||
|         nt, | ||||
|         UpdateType::CipherUpdate, | ||||
|     ) | ||||
|         .await?; | ||||
|     .await?; | ||||
|  | ||||
|     Ok(Json(cipher.to_json(&headers.host, &headers.user.uuid, None, conn).await)) | ||||
| } | ||||
| @@ -1001,7 +1001,7 @@ async fn save_attachment( | ||||
|  | ||||
|     match data.data.persist_to(&file_path).await { | ||||
|         Ok(_result) => {} | ||||
|         Err(_error) => data.data.move_copy_to(&file_path).await? | ||||
|         Err(_error) => data.data.move_copy_to(&file_path).await?, | ||||
|     } | ||||
|  | ||||
|     nt.send_cipher_update(UpdateType::CipherUpdate, &cipher, &cipher.update_users_revision(&conn).await).await; | ||||
|   | ||||
| @@ -10,9 +10,9 @@ use serde_json::Value; | ||||
| use crate::{ | ||||
|     api::{ApiResult, EmptyResult, JsonResult, JsonUpcase, Notify, NumberOrString, UpdateType}, | ||||
|     auth::{ClientIp, Headers, Host}, | ||||
|     CONFIG, | ||||
|     db::{DbConn, DbPool, models::*}, | ||||
|     db::{models::*, DbConn, DbPool}, | ||||
|     util::SafeString, | ||||
|     CONFIG, | ||||
| }; | ||||
|  | ||||
| const SEND_INACCESSIBLE_MSG: &str = "Send does not exist or is no longer available"; | ||||
| @@ -226,10 +226,9 @@ async fn post_send_file(data: Form<UploadData<'_>>, headers: Headers, conn: DbCo | ||||
|     let file_path = folder_path.join(&file_id); | ||||
|     tokio::fs::create_dir_all(&folder_path).await?; | ||||
|  | ||||
|  | ||||
|     match data.persist_to(&file_path).await { | ||||
|         Ok(_result) => {} | ||||
|         Err(_error) => data.move_copy_to(&file_path).await? | ||||
|         Err(_error) => data.move_copy_to(&file_path).await?, | ||||
|     } | ||||
|  | ||||
|     let mut data_value: Value = serde_json::from_str(&send.data)?; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user