Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit bf5bec6

Browse files
committed
Don't use failure as a compat layer for JSON-RPC errors
1 parent a68a229 commit bf5bec6

File tree

3 files changed

+1
-4
lines changed

3 files changed

+1
-4
lines changed

Cargo.lock

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rls-rustc/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ log = "0.4"
1414
rand = "0.7"
1515
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "d236b30a1d638340aad8345fa2946cfe9543dcf0", optional = true }
1616
tokio = { version = "0.1", optional = true }
17-
failure = { version = "0.1" }
1817
futures = { version = "0.1", optional = true }
1918
serde = { version = "1", features = ["derive"], optional = true }
2019
rls-data = { version = "0.19", optional = true }

rls-rustc/src/ipc.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use std::collections::{HashMap, HashSet};
22
use std::io;
33
use std::path::{Path, PathBuf};
44

5-
use failure::Fail;
65
use futures::Future;
76

87
use rls_ipc::client::{Client as JointClient, RpcChannel, RpcError};
@@ -38,7 +37,7 @@ impl rustc_span::source_map::FileLoader for IpcFileLoader {
3837
self.0
3938
.read_file(path.to_owned())
4039
.wait()
41-
.map_err(|e| io::Error::new(io::ErrorKind::Other, e.compat()))
40+
.map_err(|e| io::Error::new(io::ErrorKind::Other, format!("{}", e)))
4241
}
4342
}
4443

0 commit comments

Comments
 (0)