Rework cmd tests

Update cargo -> a5d8294 (fixes tests)
cargo update

Author: alexheretic

Cargo.lock

@@ -11,7 +11,7 @@ categories = ["development-tools"]
 build = "build.rs"
 
 [dependencies]
-cargo = { git = "https://github.com/rust-lang/cargo", rev = "9311f6d439e09da3ab918397a425be57da13f04a" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "a5d82949485802abb45f888d5b8b7f23927f031d" }
 cargo_metadata = "0.6"
 clippy_lints = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "183639b70bacf457920694d78a19cefe3565e1c0", optional = true }
 env_logger = "0.5"

Cargo.toml

@@ -1,7 +1,6 @@
 use std::thread;
 
-use crossbeam_channel::{__crossbeam_channel_codegen, __crossbeam_channel_parse, select};
-use crossbeam_channel::{bounded, Receiver, Sender};
+use crossbeam_channel::{bounded, select, Receiver, Sender};
 
 /// `ConcurrentJob` is a handle for some long-running computation
 /// off the main thread. It can be used, indirectly, to wait for