summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xformat.sh2
-rw-r--r--talpid-ipc/src/client.rs9
2 files changed, 5 insertions, 6 deletions
diff --git a/format.sh b/format.sh
index 004ab8fe8a..79ffc82f2e 100755
--- a/format.sh
+++ b/format.sh
@@ -5,7 +5,7 @@
set -u
-VERSION="0.2.9"
+VERSION="0.2.13"
CMD="rustfmt"
INSTALL_CMD="cargo install --vers $VERSION --force rustfmt-nightly"
diff --git a/talpid-ipc/src/client.rs b/talpid-ipc/src/client.rs
index f3765a52fe..8085e461a3 100644
--- a/talpid-ipc/src/client.rs
+++ b/talpid-ipc/src/client.rs
@@ -41,11 +41,10 @@ struct Handler<O: for<'de> serde::Deserialize<'de>> {
impl<O: for<'de> serde::Deserialize<'de>> Handler<O> {
fn parse_reply(&self, msg: ws::Message) -> Result<O> {
- let json: serde_json::Value =
- match msg {
- ws::Message::Text(s) => serde_json::from_str(&s),
- ws::Message::Binary(b) => serde_json::from_slice(&b),
- }.chain_err(|| "Unable to deserialize ws message as JSON")?;
+ let json: serde_json::Value = match msg {
+ ws::Message::Text(s) => serde_json::from_str(&s),
+ ws::Message::Binary(b) => serde_json::from_slice(&b),
+ }.chain_err(|| "Unable to deserialize ws message as JSON")?;
let result: Option<serde_json::Value> = match json {
serde_json::Value::Object(mut map) => map.remove("result"),
_ => None,