Skip to content

Commit d8eb793

Browse files
committed
Auto merge of #3182 - Turbo87:failure, r=pietroalbini
Remove obsolete `failure` dependency The older `oauth2` release was the last thing that needed it but with our update to tokio 1.0 we also updated `oauth2`, so we can remove the `failure` dependency now. 🎉 r? `@pietroalbini`
2 parents 1822885 + fea49c9 commit d8eb793

File tree

3 files changed

+0
-38
lines changed

3 files changed

+0
-38
lines changed

Cargo.lock

Lines changed: 0 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ dialoguer = "0.7.1"
5454
diesel = { version = "1.4.0", features = ["postgres", "serde_json", "chrono", "r2d2"] }
5555
diesel_full_text_search = "1.0.0"
5656
dotenv = "0.15"
57-
failure = "0.1.1"
5857
flate2 = "1.0"
5958
futures-channel = { version = "0.3.1", default-features = false }
6059
futures-util = "0.3"

src/controllers/user/session.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use crate::controllers::frontend_prelude::*;
22

33
use crate::github;
44
use conduit_cookie::RequestSession;
5-
use failure::Fail;
65
use oauth2::reqwest::http_client;
76
use oauth2::{AuthorizationCode, Scope, TokenResponse};
87

@@ -99,7 +98,6 @@ pub fn authorize(req: &mut dyn RequestExt) -> EndpointResult {
9998
.github
10099
.exchange_code(code)
101100
.request(http_client)
102-
.map_err(|e| e.compat())
103101
.chain_error(|| server_error("Error obtaining token"))?;
104102
let token = token.access_token();
105103

0 commit comments

Comments
 (0)