Skip to content

Commit 3814ca8

Browse files
committed
removed failure, used thiserror instead
1 parent a4d6040 commit 3814ca8

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

azure_sdk_auth_aad/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ edition = "2018"
1818
azure_sdk_core = { path = "../azure_sdk_core", version = "0.43.3" }
1919
oauth2 = { version = "3.0.0-alpha.9", features = ["reqwest-010", "futures-03"], default-features = false}
2020
url = "2.1"
21-
failure = "0.1"
2221
futures = "0.3"
2322
serde = "1.0"
2423
serde_derive = "1.0"

azure_sdk_auth_aad/src/errors.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
#[derive(Debug, Fail)]
1+
use thiserror::Error;
2+
3+
#[derive(Debug, Error)]
24
pub enum ServerReceiveError {
3-
#[fail(display = "unexpected redirect url: {}", url)]
5+
#[error("unexpected redirect url: {}", url)]
46
UnexpectedRedirectUrl { url: String },
5-
#[fail(display = "query pair not found: {}", query_pair)]
7+
#[error("query pair not found: {}", query_pair)]
68
QueryPairNotFound { query_pair: String },
7-
#[fail(
8-
display = "State secret mismatch: expected {}, recieved: {}",
9-
expected_state_secret, received_state_secret
9+
#[error(
10+
"State secret mismatch: expected {}, recieved: {}",
11+
expected_state_secret,
12+
received_state_secret
1013
)]
1114
StateSecretMismatch {
1215
expected_state_secret: String,
1316
received_state_secret: String,
1417
},
1518
}
1619

17-
#[derive(Debug, Fail, Serialize, Deserialize)]
20+
#[derive(Debug, Error, Serialize, Deserialize)]
1821
#[serde(untagged)]
1922
pub enum ErrorResponse {
20-
#[fail(
21-
display = "Unrecognized Azure error response:\n{}\n",
22-
error_description
23-
)]
23+
#[error("Unrecognized Azure error response:\n{}\n", error_description)]
2424
GenericError { error_description: String },
2525
}

azure_sdk_auth_aad/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![feature(async_closure)]
22
#[macro_use]
3-
extern crate failure;
4-
#[macro_use]
53
extern crate serde_derive;
64
extern crate log;
75
use azure_sdk_core::errors::AzureError;

0 commit comments

Comments
 (0)