From a9f704aaaaa096519a04bfe1a7c3f7985c1ef32f Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 21 Oct 2022 12:21:23 -0500 Subject: [PATCH] fix: Remove leading newline in vendor output This supersedes #11271 --- Cargo.toml | 2 +- benches/capture/Cargo.toml | 2 +- crates/cargo-test-support/Cargo.toml | 2 +- tests/testsuite/vendor.rs | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2017f2f37..0b4828315 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ strip-ansi-escapes = "0.1.0" tar = { version = "0.4.38", default-features = false } tempfile = "3.0" termcolor = "1.1" -toml_edit = { version = "0.14.3", features = ["serde", "easy", "perf"] } +toml_edit = { version = "0.15.0", features = ["serde", "easy", "perf"] } unicode-xid = "0.2.0" url = "2.2.2" walkdir = "2.2" diff --git a/benches/capture/Cargo.toml b/benches/capture/Cargo.toml index bcda38e5e..3ff3e70a1 100644 --- a/benches/capture/Cargo.toml +++ b/benches/capture/Cargo.toml @@ -9,4 +9,4 @@ description = "Tool for capturing a real-world workspace for benchmarking." cargo_metadata = "0.14.0" flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } tar = { version = "0.4.38", default-features = false } -toml_edit = { version = "0.14.3", features = ["serde", "easy", "perf"] } +toml_edit = { version = "0.15.0", features = ["serde", "easy", "perf"] } diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml index d5eb9b8c7..658bdf6df 100644 --- a/crates/cargo-test-support/Cargo.toml +++ b/crates/cargo-test-support/Cargo.toml @@ -23,7 +23,7 @@ remove_dir_all = "0.5" serde_json = "1.0" tar = { version = "0.4.38", default-features = false } termcolor = "1.1.2" -toml_edit = { version = "0.14.3", features = ["serde", "easy", "perf"] } +toml_edit = { version = "0.15.0", features = ["serde", "easy", "perf"] } url = "2.2.2" [target.'cfg(windows)'.dependencies] diff --git a/tests/testsuite/vendor.rs b/tests/testsuite/vendor.rs index 5d6165c49..8e985e265 100644 --- a/tests/testsuite/vendor.rs +++ b/tests/testsuite/vendor.rs @@ -58,8 +58,7 @@ fn vendor_sample_config() { p.cargo("vendor --respect-source-config") .with_stdout( - r#" -[source.crates-io] + r#"[source.crates-io] replace-with = "vendored-sources" [source.vendored-sources] @@ -103,8 +102,7 @@ fn vendor_path_specified() { // path is normalized by `ops::vendor` on Windows. assert_eq!( &String::from_utf8(output.stdout).unwrap(), - r#" -[source.crates-io] + r#"[source.crates-io] replace-with = "vendored-sources" [source.vendored-sources]