rust
/
cargo
mirror of https://github.com/rust-lang/cargo
0
0
Fork 0
Code Issues Releases Wiki Activity

fix: Remove leading newline in vendor output 

This supersedes #11271
This commit is contained in:
Ed Page 2022-10-21 12:21:23 -05:00
parent b1b25a0255
commit a9f704aaaa
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -58,7 +58,7 @@ strip-ansi-escapes = "0.1.0"
tar = { version = "0.4.38", default-features = false } tar = { version = "0.4.38", default-features = false }
tempfile = "3.0" tempfile = "3.0"
termcolor = "1.1" 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" unicode-xid = "0.2.0"
url = "2.2.2" url = "2.2.2"
walkdir = "2.2" walkdir = "2.2"

2
benches/capture/Cargo.toml
View File

@ -9,4 +9,4 @@ description = "Tool for capturing a real-world workspace for benchmarking."
cargo_metadata = "0.14.0" cargo_metadata = "0.14.0"
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
tar = { version = "0.4.38", default-features = false } 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"] }

2
crates/cargo-test-support/Cargo.toml
View File

@ -23,7 +23,7 @@ remove_dir_all = "0.5"
serde_json = "1.0" serde_json = "1.0"
tar = { version = "0.4.38", default-features = false } tar = { version = "0.4.38", default-features = false }
termcolor = "1.1.2" 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" url = "2.2.2"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]

6
tests/testsuite/vendor.rs
View File

@ -58,8 +58,7 @@ fn vendor_sample_config() {
p.cargo("vendor --respect-source-config") p.cargo("vendor --respect-source-config")
.with_stdout( .with_stdout(
r#" r#"[source.crates-io]
[source.crates-io]
replace-with = "vendored-sources" replace-with = "vendored-sources"
[source.vendored-sources] [source.vendored-sources]
@ -103,8 +102,7 @@ fn vendor_path_specified() {
// path is normalized by `ops::vendor` on Windows. // path is normalized by `ops::vendor` on Windows.
assert_eq!( assert_eq!(
&String::from_utf8(output.stdout).unwrap(), &String::from_utf8(output.stdout).unwrap(),
r#" r#"[source.crates-io]
[source.crates-io]
replace-with = "vendored-sources" replace-with = "vendored-sources"
[source.vendored-sources] [source.vendored-sources]