Preserve lockfile top comment #6181
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @matklad (rust_highfive has picked a reviewer for you, use r? to override) |
|
WDYT? |
src/cargo/ops/lockfile.rs
Outdated
| @@ -43,6 +43,15 @@ pub fn write_pkg_lockfile(ws: &Workspace, resolve: &Resolve) -> CargoResult<()> | |||
|
|
|||
| let mut out = String::new(); | |||
|
|
|||
| if let Ok(ref orig) = orig { | |||
| if let Some(first_line) = orig.lines().into_iter().next() { | |||
There was a problem hiding this comment.
Could this perhaps be...
if let Ok(orig) = &orig {
for line in org.lines().take_while(|line| line.starts_with("#")) {
out.push_str(line);
out.push_str("\n");
}
}That way we can preserve multiline comments if necessary as well
tests/testsuite/update.rs
Outdated
| println!("loaded Cargo.lock contents:\n{}", lockfile2); | ||
|
|
||
| let first_line = lockfile2.lines().into_iter().next().unwrap(); | ||
| assert!(first_line == "# @generated"); |
There was a problem hiding this comment.
Instead of just asserting the first line, could this assert that the lock files are byte-for-byte equal the most recent lockfile does indeed contain @generated?
|
@bors: r+ |
|
📌 Commit 32fbfe3 has been approved by |
bors
added a commit
that referenced
this pull request
Oct 18, 2018
…richton Preserve lockfile top comment Refs #6180
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs #6180