Merge pull request #1650 from Xanewok/ipc-feature-build-fix

Fix and check the build with ipc feature enabled
rust-lang · Mar 7, 2020 · 521498c · 521498c
2 parents fe46c95 + fab8edc
commit 521498c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -39,4 +39,6 @@ jobs:
       rls-vfs: []
       ".":
         - test_name: test_tooltip_std
-          args: --ignored
+          test_args: --ignored
+      # Test also the IPC feature build
+        - args: --features ipc
diff --git a/ci/azure-test.yml b/ci/azure-test.yml
@@ -24,6 +24,6 @@ jobs:
         displayName: Run tests - ${{ crate.key }}
         workingDirectory: $(Build.SourcesDirectory)/${{ crate.key }}
       - ${{ each extra in crate.value }}:
-        - script: cargo test -v ${{ extra.test_name }} -- ${{ extra.args }}
+        - script: cargo test -v ${{ extra.args }} ${{ extra.test_name }} -- ${{ extra.test_args }}
           displayName: Run tests - ${{ crate.key }} - ${{ extra.test_name }}
           workingDirectory: $(Build.SourcesDirectory)/${{ crate.key }}
diff --git a/rls-rustc/Cargo.toml b/rls-rustc/Cargo.toml
@@ -14,6 +14,7 @@ log = "0.4"
 rand = "0.7"
 clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "8b7f7e667268921c278af94ae30a61e87a22b22b", 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 }

diff --git a/rls-rustc/src/ipc.rs b/rls-rustc/src/ipc.rs
@@ -2,6 +2,7 @@ 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};

diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs
@@ -126,7 +126,7 @@ pub struct CompilationResult {
 fn run_out_of_process(
     changed: HashMap<PathBuf, String>,
     args: &[String],
-    envs: &HashMap<String, Option<OsString>>,
+    envs: &BTreeMap<String, Option<OsString>>,
     clippy_preference: ClippyPreference,
 ) -> Result<CompilationResult, ()> {
     let analysis = Arc::default();