Skip to content

Commit 6b07c8d

Browse files
committed
cargo fmt
1 parent ec21e12 commit 6b07c8d

File tree

6 files changed

+21
-10
lines changed

6 files changed

+21
-10
lines changed

src/cargo/core/compiler/custom_build.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ fn emit_build_output(state: &JobState<'_>, output: &BuildOutput, package_id: Pac
110110
linked_paths: &library_paths,
111111
cfgs: &output.cfgs,
112112
env: &output.env,
113-
}.to_json_string();
113+
}
114+
.to_json_string();
114115
state.stdout(&msg);
115116
}
116117

src/cargo/ops/cargo_generate_lockfile.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,15 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
5454
// by precise package update later.
5555
Some(_) => {
5656
let mut registry = PackageRegistry::new(opts.config)?;
57-
ops::resolve_with_previous(&mut registry, ws, Method::Everything,
58-
None, None, &[], true)?
57+
ops::resolve_with_previous(
58+
&mut registry,
59+
ws,
60+
Method::Everything,
61+
None,
62+
None,
63+
&[],
64+
true,
65+
)?
5966
}
6067
}
6168
}

tests/testsuite/build.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4573,11 +4573,13 @@ fn pipelining_works() {
45734573
foo.cargo("build")
45744574
.env("CARGO_BUILD_PIPELINING", "true")
45754575
.with_stdout("")
4576-
.with_stderr("\
4576+
.with_stderr(
4577+
"\
45774578
[COMPILING] [..]
45784579
[COMPILING] [..]
45794580
[FINISHED] [..]
4580-
")
4581+
",
4582+
)
45814583
.run();
45824584
}
45834585

@@ -4628,13 +4630,15 @@ fn forward_rustc_output() {
46284630

46294631
foo.cargo("build")
46304632
.with_stdout("a\nb\n{}")
4631-
.with_stderr("\
4633+
.with_stderr(
4634+
"\
46324635
[COMPILING] [..]
46334636
[COMPILING] [..]
46344637
c
46354638
d
46364639
{a
46374640
[FINISHED] [..]
4638-
")
4641+
",
4642+
)
46394643
.run();
46404644
}

tests/testsuite/registry.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2008,7 +2008,6 @@ fn readonly_registry_still_works() {
20082008
// make sure we un-readonly the files afterwards so "cargo clean" can remove them (#6934)
20092009
chmod_readonly(&paths::home(), false);
20102010

2011-
20122011
fn chmod_readonly(path: &Path, readonly: bool) {
20132012
for entry in t!(path.read_dir()) {
20142013
let entry = t!(entry);

tests/testsuite/rustc.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ fn build_with_args_to_one_of_multiple_binaries() {
113113
-C debuginfo=2 -C debug-assertions [..]`
114114
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
115115
",
116-
).run();
116+
)
117+
.run();
117118
}
118119

119120
#[test]

tests/testsuite/update.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,6 @@ fn update_precise_first_run() {
556556
",
557557
)
558558
.run();
559-
560559
}
561560

562561
#[test]

0 commit comments

Comments
 (0)