Skip to content

Commit 08be519

Browse files
committed
Update to the latest Cargo
Found as part of rust-lang/rust#52919
1 parent ecd29a7 commit 08be519

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

Cargo.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories = ["development-tools"]
1313
build = "build.rs"
1414

1515
[dependencies]
16-
cargo = { git = "https://github.com/rust-lang/cargo", rev = "1ec8c70d00afa77deafb8fbd4c1d07fb68b2b556" }
16+
cargo = { git = "https://github.com/rust-lang/cargo", rev = "0b80061cacce00dabe8ca25448517d4ac27de2ab" }
1717
cargo_metadata = "0.5.2"
1818
clippy_lints = { git = "https://github.com/rust-lang-nursery/rust-clippy", rev = "1f656173723dce4efc3fc90ff5763a2186ec9089", optional = true }
1919
env_logger = "0.5"

src/build/cargo.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ fn run_cargo(
168168

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

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

229-
match compile_with_exec(&ws, &compile_opts, Arc::new(exec)) {
229+
let exec = Arc::new(exec) as Arc<dyn Executor>;
230+
match compile_with_exec(&ws, &compile_opts, &exec) {
230231
Ok(_) => {
231232
trace!(
232233
"Created build plan after Cargo compilation routine: {:?}",

0 commit comments

Comments
 (0)