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

By default use out-of-process compilation #1670

Merged
merged 2 commits into from
May 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ rustc_tools_util = "0.2"
[features]
clippy = ["clippy_lints", "rls-rustc/clippy"]
ipc = ["tokio", "futures", "rls-rustc/ipc", "rls-ipc/server"]
default = []
default = ["ipc"]
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ jobs:
".":
- test_name: test_tooltip_std
test_args: --ignored
# Test also the IPC feature build
- args: --features ipc
# Test that we don't regress in-process compilation build
- args: --no-default-features
1 change: 0 additions & 1 deletion rls-rustc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ log = "0.4"
rand = "0.7"
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "d236b30a1d638340aad8345fa2946cfe9543dcf0", optional = true }
tokio = { version = "0.1", optional = true }
failure = { version = "0.1" }
futures = { version = "0.1", optional = true }
serde = { version = "1", features = ["derive"], optional = true }
rls-data = { version = "0.19", optional = true }
Expand Down
3 changes: 1 addition & 2 deletions rls-rustc/src/ipc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use std::collections::{HashMap, HashSet};
use std::io;
use std::path::{Path, PathBuf};

use failure::Fail;
use futures::Future;

use rls_ipc::client::{Client as JointClient, RpcChannel, RpcError};
Expand Down Expand Up @@ -38,7 +37,7 @@ impl rustc_span::source_map::FileLoader for IpcFileLoader {
self.0
.read_file(path.to_owned())
.wait()
.map_err(|e| io::Error::new(io::ErrorKind::Other, e.compat()))
.map_err(|e| io::Error::new(io::ErrorKind::Other, format!("{}", e)))
}
}

Expand Down