diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-03-22 15:00:49 +0800 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-03-22 15:00:49 +0800 |
| commit | 9fcc8f4c3f32ccb12f58c3405669b7a921ed2e7e (patch) | |
| tree | 12f9b48a8c166be005355def6a07616c6ef2e5e3 | |
| parent | d5a8d70e7cef9cc757480ac41a2ab88e085b92df (diff) | |
| download | mullvadvpn-9fcc8f4c3f32ccb12f58c3405669b7a921ed2e7e.tar.xz mullvadvpn-9fcc8f4c3f32ccb12f58c3405669b7a921ed2e7e.zip | |
Remove the ReplyFailure ErrorKind
| -rw-r--r-- | talpid_ipc/src/http_ipc.rs | 5 | ||||
| -rw-r--r-- | talpid_ipc/src/lib.rs | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/talpid_ipc/src/http_ipc.rs b/talpid_ipc/src/http_ipc.rs index dc554d8bfa..46a22eab3d 100644 --- a/talpid_ipc/src/http_ipc.rs +++ b/talpid_ipc/src/http_ipc.rs @@ -56,12 +56,12 @@ fn parse_request<T: serde::Deserialize>(request: &mut tiny_http::Request) -> Res fn send_response<U: serde::Serialize>(response: &U, request: tiny_http::Request) -> Result<()> { serde_json::to_string(response) - .chain_err(|| ErrorKind::ReplyFailure) + .chain_err(|| ErrorKind::ParseFailure) .and_then(|response_as_string| { debug!("HTTP IPC responding with {:?}", response_as_string); request.respond(tiny_http::Response::from_string(response_as_string)) - .chain_err(|| ErrorKind::ReplyFailure) + .chain_err(|| "Failed responding to HTTP request") }) } @@ -97,7 +97,6 @@ impl<T, U> IpcClient<T, U> .send() .chain_err(|| ErrorKind::SendError)?; - Self::parse_reply(&mut reply) } diff --git a/talpid_ipc/src/lib.rs b/talpid_ipc/src/lib.rs index 2e32997620..1fcfe47962 100644 --- a/talpid_ipc/src/lib.rs +++ b/talpid_ipc/src/lib.rs @@ -35,8 +35,5 @@ error_chain!{ SendError { description("Unable to send message") } - ReplyFailure { - description("The server failed to reply to the request") - } } } |
