saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-05-25 13:03:57 +00:00
Code Activity

Update rocket to latest master

Browse source 
Downgrade rust version to fix cargo issue
Set rustup profile to minimal
This commit is contained in:
Daniel García 2019-10-24 23:21:04 +02:00
parent 57b1d3f850
commit fccc0a4b05
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
17 changed files with 74 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/db/mod.rs
View file

@ -76,7 +76,8 @@ impl<'a, 'r> FromRequest<'a, 'r> for DbConn {
type Error = ();
fn from_request(request: &'a Request<'r>) -> request::Outcome<DbConn, ()> {
let pool = request.guard::<State<Pool>>()?;
// https://github.com/SergioBenitez/Rocket/commit/e3c1a4ad3ab9b840482ec6de4200d30df43e357c
let pool = try_outcome!(request.guard::<State<Pool>>());
match pool.get() {
Ok(conn) => Outcome::Success(DbConn(conn)),
Err(_) => Outcome::Failure((Status::ServiceUnavailable, ())),

2
src/main.rs
View file

@ -1,4 +1,4 @@
#![feature(proc_macro_hygiene, decl_macro, vec_remove_item, try_trait, ip)]
#![feature(proc_macro_hygiene, vec_remove_item, try_trait, ip)]
#![recursion_limit = "256"]
#[cfg(feature = "openssl")]