summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-08-10 14:58:01 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-08-10 15:52:41 +0200
commit09208b9c49870d39a46d63f97b62c03aff43aba0 (patch)
treeccb0bb65dbabc68fb719cf80474dd4e95932138d
parent380f8cd8ec9d2d37801f9cc8f2b77216feed8ea6 (diff)
downloadmullvadvpn-09208b9c49870d39a46d63f97b62c03aff43aba0.tar.xz
mullvadvpn-09208b9c49870d39a46d63f97b62c03aff43aba0.zip
Rename DeadlineError to DownloadTimeoutError
-rw-r--r--mullvad-daemon/src/relays.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs
index 4dbed24d6a..6d33c8900f 100644
--- a/mullvad-daemon/src/relays.rs
+++ b/mullvad-daemon/src/relays.rs
@@ -32,7 +32,7 @@ error_chain! {
errors {
RelayCacheError { description("Error with relay cache on disk") }
DownloadError { description("Error when trying to download the list of relays") }
- DeadlineError { description("Timed out when trying to download the list of relays") }
+ DownloadTimeoutError { description("Timed out when trying to download the list of relays") }
NoRelay { description("No relays matching current constraints") }
SerializationError { description("Error in serialization of relaylist") }
}
@@ -42,7 +42,7 @@ impl From<DeadlineError<Error>> for Error {
fn from(e: DeadlineError<Error>) -> Error {
match e.into_inner() {
Some(inner_e) => inner_e,
- None => Error::from_kind(ErrorKind::DeadlineError),
+ None => Error::from_kind(ErrorKind::DownloadTimeoutError),
}
}
}