Merge pull request #822 from matklad/cargo-update

Update Cargo to the latest master

Author: nrc

Cargo.lock

@@ -10,7 +10,7 @@ categories = ["development-tools"]
 build = "build.rs"
 
 [dependencies]
-cargo = { git = "https://github.com/rust-lang/cargo", rev = "b70ab13b31628e91b05961d55c07abf20ad49de6" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "008c3690846798d678f4a0a45ee46cc9ff6dc90f" }
 cargo_metadata = "0.5.2"
 env_logger = "0.5"
 failure = "0.1.1"

Cargo.toml

@@ -9,8 +9,8 @@
 // except according to those terms.
 
 use cargo::core::{PackageId, Shell, Target, TargetKind, Verbosity, Workspace};
-use cargo::ops::{compile_with_exec, CompileFilter, CompileMode, CompileOptions, Context, Executor,
-                 Packages, Unit};
+use cargo::core::compiler::{Context, Executor, Unit};
+use cargo::ops::{compile_with_exec, CompileFilter, CompileMode, CompileOptions, Packages};
 use cargo::util::{homedir, important_paths, CargoResult, Config as CargoConfig, ConfigValue,
                   ProcessBuilder};
 use failure;

src/build/cargo.rs

@@ -32,7 +32,7 @@ use std::sync::mpsc::Sender;
 
 use build::PackageArg;
 use cargo::core::{PackageId, Profile, Target, TargetKind};
-use cargo::ops::{Context, Kind, Unit};
+use cargo::core::compiler::{Context, Kind, Unit};
 use cargo::util::{CargoResult, ProcessBuilder};
 use cargo_metadata;
 use lsp_data::parse_file_path;