pdg: check in Cargo.locks for analysis tests#1429
Merged
Conversation
We had a blanket rule to ignore all but the top-level `Cargo.lock`. I think this was intended for `tests/`, but `tests/.gitignore` already does this, too. These `Cargo.lock`s are needed, or else our pinned nightly (Rust 1.65) `cargo` will select `syn v2.0`, which can't be built on Rust 1.65. This is needed by `c2rust-instrument`, so upgrading the generated nightly here isn't feasible. All of `c2rust-instrument` would have to be upgraded, which is more involved. Furthermore, having the `Cargo.lock` should avoid `cargo` having to fetch the whole registry every time, which might help speed up CI.
fw-immunant
approved these changes
Oct 23, 2025
Contributor
fw-immunant
left a comment
fw-immunant
left a comment
There was a problem hiding this comment.
Fixes the cargo test phase of CI and seems reasonable. Thanks for digging through all our complex versioning/dependency setup, it really seems like a rat's nest.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
We had a blanket rule to ignore all but the top-level
Cargo.lock. I think this was intended fortests/, buttests/.gitignorealready does this, too. TheseCargo.locks are needed, or else our pinned nightly (Rust 1.65)cargowill selectsyn v2.0, which can't be built on Rust 1.65. This is needed byc2rust-instrument, so upgrading the generated nightly here isn't feasible. All ofc2rust-instrumentwould have to be upgraded, which is more involved.Furthermore, having the
Cargo.lockshould avoidcargohaving to fetch the whole registry every time, which might help speed up CI.There's another similar
syn v2.0error intest_translator.py. I'll fix that separately, butcargo testand the pdg tests should be good now.