Mirrors/Vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-13 14:32:44 +01:00
Code Issues Releases Activity

Remove Result<T, E: Debug> in preparation of deprecation as Rocket responder.

Browse Source 
Removed unnecessary returns
This commit is contained in:
Daniel García 2019-09-17 21:05:56 +02:00
parent b73ff886c3
commit 4c07f05b3a
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/web.rs
View File

@ -1,4 +1,3 @@
use std::io;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use rocket::http::ContentType; use rocket::http::ContentType;
@ -21,10 +20,10 @@ pub fn routes() -> Vec<Route> {
} }
#[get("/")] #[get("/")]
fn web_index() -> Cached<io::Result<NamedFile>> { fn web_index() -> Cached<Option<NamedFile>> {
Cached::short(NamedFile::open( Cached::short(NamedFile::open(
Path::new(&CONFIG.web_vault_folder()).join("index.html"), Path::new(&CONFIG.web_vault_folder()).join("index.html"),
)) ).ok())
} }
#[get("/app-id.json")] #[get("/app-id.json")]
@ -47,13 +46,13 @@ fn app_id() -> Cached<Content<Json<Value>>> {
} }
#[get("/<p..>", rank = 10)] // Only match this if the other routes don't match #[get("/<p..>", rank = 10)] // Only match this if the other routes don't match
fn web_files(p: PathBuf) -> Cached<io::Result<NamedFile>> { fn web_files(p: PathBuf) -> Cached<Option<NamedFile>> {
Cached::long(NamedFile::open(Path::new(&CONFIG.web_vault_folder()).join(p))) Cached::long(NamedFile::open(Path::new(&CONFIG.web_vault_folder()).join(p)).ok())
} }
#[get("/attachments/<uuid>/<file..>")] #[get("/attachments/<uuid>/<file..>")]
fn attachments(uuid: String, file: PathBuf) -> io::Result<NamedFile> { fn attachments(uuid: String, file: PathBuf) -> Option<NamedFile> {
NamedFile::open(Path::new(&CONFIG.attachments_folder()).join(uuid).join(file)) NamedFile::open(Path::new(&CONFIG.attachments_folder()).join(uuid).join(file)).ok()
} }
#[get("/alive")] #[get("/alive")]

4
src/db/models/attachment.rs
View File

@ -61,7 +61,7 @@ use crate::error::MapResult;
impl Attachment { impl Attachment {
#[cfg(feature = "postgresql")] #[cfg(feature = "postgresql")]
pub fn save(&self, conn: &DbConn) -> EmptyResult { pub fn save(&self, conn: &DbConn) -> EmptyResult {
return diesel::insert_into(attachments::table) diesel::insert_into(attachments::table)
.values(self) .values(self)
.on_conflict(attachments::id) .on_conflict(attachments::id)
.do_update() .do_update()
@ -72,7 +72,7 @@ impl Attachment {
#[cfg(not(feature = "postgresql"))] #[cfg(not(feature = "postgresql"))]
pub fn save(&self, conn: &DbConn) -> EmptyResult { pub fn save(&self, conn: &DbConn) -> EmptyResult {
return diesel::replace_into(attachments::table) diesel::replace_into(attachments::table)
.values(self) .values(self)
.execute(&**conn) .execute(&**conn)
.map_res("Error saving attachment") .map_res("Error saving attachment")