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

Commit 1cb7c09

Browse files
authored
Merge pull request #1670 from Xanewok/use-ipc
By default use out-of-process compilation
2 parents 421ea53 + bf5bec6 commit 1cb7c09

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

Cargo.lock

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

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ rustc_tools_util = "0.2"
8080
[features]
8181
clippy = ["clippy_lints", "rls-rustc/clippy"]
8282
ipc = ["tokio", "futures", "rls-rustc/ipc", "rls-ipc/server"]
83-
default = []
83+
default = ["ipc"]

azure-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ jobs:
4040
".":
4141
- test_name: test_tooltip_std
4242
test_args: --ignored
43-
# Test also the IPC feature build
44-
- args: --features ipc
43+
# Test that we don't regress in-process compilation build
44+
- args: --no-default-features

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)