saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-08-09 04:29:09 +00:00
Code Activity

Updated dependencies

Browse source
This commit is contained in:
Daniel García 2019-02-01 23:39:14 +01:00
commit 20d8d800f3
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
5 changed files with 165 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/core/ciphers.rs
View file

@ -659,7 +659,7 @@ fn post_attachment(
Multipart::with_body(data.open(), boundary)
.foreach_entry(|mut field| {
match field.headers.name.as_str() {
match &*field.headers.name {
"key" => {
use std::io::Read;
let mut key_buffer = String::new();

4
src/error.rs
View file

@ -35,12 +35,13 @@ macro_rules! make_error {
use diesel::result::Error as DieselErr;
use handlebars::RenderError as HbErr;
use jsonwebtoken::errors::Error as JWTErr;
use regex::Error as RegexErr;
use reqwest::Error as ReqErr;
use serde_json::{Error as SerdeErr, Value};
use std::io::Error as IOErr;
use std::time::SystemTimeError as TimeErr;
use u2f::u2ferror::U2fError as U2fErr;
use regex::Error as RegexErr;
use yubico::yubicoerror::YubicoError as YubiErr;
// Error struct
// Contains a String error message, meant for the user and an enum variant, with an error of different types.
@ -62,6 +63,7 @@ make_error! {
TimeError(TimeErr): _has_source, _api_error,
ReqError(ReqErr): _has_source, _api_error,
RegexError(RegexErr): _has_source, _api_error,
YubiError(YubiErr): _has_source, _api_error,
}
impl std::fmt::Debug for Error {