Ignore malformed manifests on git dependencies #3998
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
src/cargo/ops/cargo_read_manifest.rs
Outdated
| return Ok(()); | ||
| } | ||
|
|
||
| let (manifest, nested) = result.unwrap(); |
There was a problem hiding this comment.
This might be best expressed with a match perhaps? That'd at least avoid the .unwrap() here
src/cargo/ops/cargo_read_manifest.rs
Outdated
| let (manifest, nested) = read_manifest(&manifest_path, source_id, config)?; | ||
| let result = read_manifest(&manifest_path, source_id, config); | ||
|
|
||
| // Ignore malformed manifests |
There was a problem hiding this comment.
Could you expand this comment as well with some rationale as to why malformed manifests are ignored?
|
I just refactorized the code and added a test. |
|
@bors: r+ Thanks! |
|
📌 Commit c560869 has been approved by |
Ignore malformed manifests on git dependencies Fix for #3935
|
☀️ Test successful - status-appveyor, status-travis |
Commit 3d6de41 (rust-lang#3998) made cargo ignore Cargo.toml files that are invalid TOML in a git source. This change further ignores Cargo.toml files that are valid TOML but cannot really be loaded. This is potentially an alternative fix for rust-lang#6822.
Fix for #3935