Auto merge of #1388 - ehuss:update-cargo, r=Xanewok

Update cargo and clippy. Cargo had a minor api change due to rust-lang/cargo#6683. Clippy needed an update to build with latest nightly.
rust-lang · Mar 4, 2019 · 6a1b5a9 · 6a1b5a9
2 parents 178c7ad + 0e970e9
commit 6a1b5a9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,9 +28,9 @@ rls-rustc = "0.5.0"
 rls-span = { version = "0.4", features = ["serialize-serde"] }
 rls-vfs = "0.7"
 
-cargo = { git = "https://github.com/rust-lang/cargo", rev = "4e74e2fc0908524d17735c768067117d3e84ee9c" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "716b02cb4c7b75ce435eb06defa25bc2d725909c" }
 cargo_metadata = "0.7"
-clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "f69ec96906d300132ffd33151bf6641b950db96d", optional = true }
+clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "caccf8bd4c3d490d6a4cf329a3411bbf68753642", optional = true }
 env_logger = "0.6"
 failure = "0.1.1"
 home = "0.3"

diff --git a/rls/src/build/cargo.rs b/rls/src/build/cargo.rs
@@ -206,7 +206,7 @@ fn run_cargo_ws(
 
     let compile_opts = CompileOptions {
         spec,
-        filter: CompileFilter::new(
+        filter: CompileFilter::from_raw_arguments(
             opts.lib,
             opts.bin,
             opts.bins,