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

Commit 5469f58

Browse files
committed
Fix compiling with 'ipc' feature enabled
1 parent fe46c95 commit 5469f58

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rls-rustc/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ log = "0.4"
1414
rand = "0.7"
1515
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "8b7f7e667268921c278af94ae30a61e87a22b22b", optional = true }
1616
tokio = { version = "0.1", optional = true }
17+
failure = { version = "0.1" }
1718
futures = { version = "0.1", optional = true }
1819
serde = { version = "1", features = ["derive"], optional = true }
1920
rls-data = { version = "0.19", optional = true }

rls-rustc/src/ipc.rs

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

5+
use failure::Fail;
56
use futures::Future;
67

78
use rls_ipc::client::{Client as JointClient, RpcChannel, RpcError};

rls/src/build/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ pub struct CompilationResult {
126126
fn run_out_of_process(
127127
changed: HashMap<PathBuf, String>,
128128
args: &[String],
129-
envs: &HashMap<String, Option<OsString>>,
129+
envs: &BTreeMap<String, Option<OsString>>,
130130
clippy_preference: ClippyPreference,
131131
) -> Result<CompilationResult, ()> {
132132
let analysis = Arc::default();

0 commit comments

Comments
 (0)