Skip to content

Commit

Permalink
cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
ehuss committed May 20, 2019
1 parent ec21e12 commit 6b07c8d
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
3 changes: 2 additions & 1 deletion src/cargo/core/compiler/custom_build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ fn emit_build_output(state: &JobState<'_>, output: &BuildOutput, package_id: Pac
linked_paths: &library_paths,
cfgs: &output.cfgs,
env: &output.env,
}.to_json_string();
}
.to_json_string();
state.stdout(&msg);
}

Expand Down
11 changes: 9 additions & 2 deletions src/cargo/ops/cargo_generate_lockfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,15 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
// by precise package update later.
Some(_) => {
let mut registry = PackageRegistry::new(opts.config)?;
ops::resolve_with_previous(&mut registry, ws, Method::Everything,
None, None, &[], true)?
ops::resolve_with_previous(
&mut registry,
ws,
Method::Everything,
None,
None,
&[],
true,
)?
}
}
}
Expand Down
12 changes: 8 additions & 4 deletions tests/testsuite/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4573,11 +4573,13 @@ fn pipelining_works() {
foo.cargo("build")
.env("CARGO_BUILD_PIPELINING", "true")
.with_stdout("")
.with_stderr("\
.with_stderr(
"\
[COMPILING] [..]
[COMPILING] [..]
[FINISHED] [..]
")
",
)
.run();
}

Expand Down Expand Up @@ -4628,13 +4630,15 @@ fn forward_rustc_output() {

foo.cargo("build")
.with_stdout("a\nb\n{}")
.with_stderr("\
.with_stderr(
"\
[COMPILING] [..]
[COMPILING] [..]
c
d
{a
[FINISHED] [..]
")
",
)
.run();
}
1 change: 0 additions & 1 deletion tests/testsuite/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2008,7 +2008,6 @@ fn readonly_registry_still_works() {
// make sure we un-readonly the files afterwards so "cargo clean" can remove them (#6934)
chmod_readonly(&paths::home(), false);


fn chmod_readonly(path: &Path, readonly: bool) {
for entry in t!(path.read_dir()) {
let entry = t!(entry);
Expand Down
3 changes: 2 additions & 1 deletion tests/testsuite/rustc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ fn build_with_args_to_one_of_multiple_binaries() {
-C debuginfo=2 -C debug-assertions [..]`
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
).run();
)
.run();
}

#[test]
Expand Down
1 change: 0 additions & 1 deletion tests/testsuite/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@ fn update_precise_first_run() {
",
)
.run();

}

#[test]
Expand Down

0 comments on commit 6b07c8d

Please sign in to comment.