saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-10 18:55:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to rust 2018 edition

Browse Source
This commit is contained in:
Daniel García
2018-12-07 02:05:45 +01:00
parent 2fde4e6933
commit 94810c106a
25 changed files with 105 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/util.rs
View File

@@ -23,7 +23,7 @@ macro_rules! err {
#[macro_export]
macro_rules! err_json {
($expr:expr) => {{
return Err($crate::rocket::response::status::BadRequest(Some($crate::rocket_contrib::json::Json($expr))));
return Err(rocket::response::status::BadRequest(Some(rocket_contrib::json::Json($expr))));
}}
}
@@ -31,7 +31,7 @@ macro_rules! err_json {
macro_rules! err_handler {
($expr:expr) => {{
error!("{}", $expr);
return $crate::rocket::Outcome::Failure(($crate::rocket::http::Status::Unauthorized, $expr));
return rocket::Outcome::Failure((rocket::http::Status::Unauthorized, $expr));
}}
}