Skip to content

Commit 071eeaf

Browse files
committed
Auto merge of #11273 - epage:toml, r=weihanglo
fix: Remove leading newline in vendor output This supersedes #11271
2 parents 174ec74 + a9f704a commit 071eeaf

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ strip-ansi-escapes = "0.1.0"
5858
tar = { version = "0.4.38", default-features = false }
5959
tempfile = "3.0"
6060
termcolor = "1.1"
61-
toml_edit = { version = "0.14.3", features = ["serde", "easy", "perf"] }
61+
toml_edit = { version = "0.15.0", features = ["serde", "easy", "perf"] }
6262
unicode-xid = "0.2.0"
6363
url = "2.2.2"
6464
walkdir = "2.2"

benches/capture/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ description = "Tool for capturing a real-world workspace for benchmarking."
99
cargo_metadata = "0.14.0"
1010
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
1111
tar = { version = "0.4.38", default-features = false }
12-
toml_edit = { version = "0.14.3", features = ["serde", "easy", "perf"] }
12+
toml_edit = { version = "0.15.0", features = ["serde", "easy", "perf"] }

crates/cargo-test-support/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ remove_dir_all = "0.5"
2323
serde_json = "1.0"
2424
tar = { version = "0.4.38", default-features = false }
2525
termcolor = "1.1.2"
26-
toml_edit = { version = "0.14.3", features = ["serde", "easy", "perf"] }
26+
toml_edit = { version = "0.15.0", features = ["serde", "easy", "perf"] }
2727
url = "2.2.2"
2828

2929
[target.'cfg(windows)'.dependencies]

tests/testsuite/vendor.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ fn vendor_sample_config() {
5858

5959
p.cargo("vendor --respect-source-config")
6060
.with_stdout(
61-
r#"
62-
[source.crates-io]
61+
r#"[source.crates-io]
6362
replace-with = "vendored-sources"
6463
6564
[source.vendored-sources]
@@ -103,8 +102,7 @@ fn vendor_path_specified() {
103102
// path is normalized by `ops::vendor` on Windows.
104103
assert_eq!(
105104
&String::from_utf8(output.stdout).unwrap(),
106-
r#"
107-
[source.crates-io]
105+
r#"[source.crates-io]
108106
replace-with = "vendored-sources"
109107
110108
[source.vendored-sources]

0 commit comments

Comments
 (0)