itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve multiline top comments

Browse Source
This commit is contained in:
Dale Wijnand 2018-10-18 06:44:12 +01:00
parent 0cdb780345
commit ce40ab87c8
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cargo/ops/lockfile.rs
View File

@ -43,12 +43,10 @@ pub fn write_pkg_lockfile(ws: &Workspace, resolve: &Resolve) -> CargoResult<()>
let mut out = String::new(); let mut out = String::new();
if let Ok(ref orig) = orig { if let Ok(orig) = &orig {
if let Some(first_line) = orig.lines().into_iter().next() { for line in orig.lines().take_while(|line| line.starts_with("#")) {
if first_line.starts_with("#") { out.push_str(line);
out.push_str(first_line); out.push_str("\n");
out.push_str("\n");
}
} }
} }

1
tests/testsuite/update.rs
View File

@ -383,6 +383,7 @@ fn preserve_top_comment() {
let mut lockfile = p.read_file("Cargo.lock"); let mut lockfile = p.read_file("Cargo.lock");
lockfile.insert_str(0, "# @generated\n"); lockfile.insert_str(0, "# @generated\n");
lockfile.insert_str(0, "# some other comment\n");
println!("saving Cargo.lock contents:\n{}", lockfile); println!("saving Cargo.lock contents:\n{}", lockfile);
p.change_file("Cargo.lock", &lockfile); p.change_file("Cargo.lock", &lockfile);