itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

extracted duplicated chunk of code into fn emit_build_output, removed redundant line from compiler_json_error_format test

Browse Source
This commit is contained in:
debris 2018-06-04 10:03:13 +02:00
parent f101d88ebd
commit 66aa9bff66
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/cargo/core/compiler/custom_build.rs
View File

@ -105,6 +105,22 @@ pub fn prepare<'a, 'cfg>(
}
}
fn emit_build_output(output: &BuildOutput, id: &PackageId) {
let library_paths = output
.library_paths
.iter()
.map(|l| l.display().to_string())
.collect::<Vec<_>>();
machine_message::emit(&machine_message::BuildScript {
package_id: id,
linked_libs: &output.library_links,
linked_paths: &library_paths,
cfgs: &output.cfgs,
env: &output.env,
});
}
fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult<(Work, Work)> {
assert!(unit.mode.is_run_custom_build());
let bcx = &cx.bcx;
@ -336,18 +352,7 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoRes
BuildOutput::parse(&output.stdout, &pkg_name, &root_output, &root_output)?;
if json_messages {
let library_paths = parsed_output
.library_paths
.iter()
.map(|l| l.display().to_string())
.collect::<Vec<_>>();
machine_message::emit(&machine_message::BuildScript {
package_id: &id,
linked_libs: &parsed_output.library_links,
linked_paths: &library_paths,
cfgs: &parsed_output.cfgs,
env: &parsed_output.env,
});
emit_build_output(&parsed_output, &id);
}
build_state.insert(id, kind, parsed_output);
}
@ -367,18 +372,7 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoRes
};
if json_messages {
let library_paths = output
.library_paths
.iter()
.map(|l| l.display().to_string())
.collect::<Vec<_>>();
machine_message::emit(&machine_message::BuildScript {
package_id: &id,
linked_libs: &output.library_links,
linked_paths: &library_paths,
cfgs: &output.cfgs,
env: &output.env,
});
emit_build_output(&output, &id);
}
build_state.insert(id, kind, output);

1
tests/testsuite/build.rs
View File

@ -3976,7 +3976,6 @@ fn compiler_json_error_format() {
name = "foo"
version = "0.5.0"
authors = ["wycats@example.com"]
build = "build.rs"
[dependencies.bar]
path = "bar"