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

Update to the latest Cargo #975

Merged
merged 1 commit into from
Aug 1, 2018
Merged

Update to the latest Cargo #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["development-tools"]
build = "build.rs"

[dependencies]
cargo = { git = "https://github.com/rust-lang/cargo", rev = "1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556" }
cargo = { git = "https://github.com/rust-lang/cargo", rev = "0b80061cacce00dabe8ca25448517d4ac27de2ab" }
cargo_metadata = "0.5.2"
clippy_lints = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "1f656173723dce4efc3fc90ff5763a2186ec9089", optional = true }
env_logger = "0.5"
Expand Down
5 changes: 3 additions & 2 deletions src/build/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ fn run_cargo(

let spec = Packages::from_flags(all, Vec::new(), packages)?;

let pkg_names = spec.into_package_id_specs(&ws)?.iter()
let pkg_names = spec.to_package_id_specs(&ws)?.iter()
.map(|pkg_spec| pkg_spec.name().to_owned())
.collect();
trace!("Specified packages to be built by Cargo: {:#?}", pkg_names);
Expand Down Expand Up @@ -226,7 +226,8 @@ fn run_cargo(
reached_primary.clone(),
);

match compile_with_exec(&ws, &compile_opts, Arc::new(exec)) {
let exec = Arc::new(exec) as Arc<dyn Executor>;
match compile_with_exec(&ws, &compile_opts, &exec) {
Ok(_) => {
trace!(
"Created build plan after Cargo compilation routine: {:?}",
Expand Down