Reunify Cargo workspace #958
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
tarcieri
commented
Mar 9, 2022
Comment on lines
+26
to
+31
| # TODO(tarcieri): re-enable when `zeroize` compatibility can be resolved | ||
| #[dev-dependencies.hpke] | ||
| #git = "https://github.com/rozbb/rust-hpke" | ||
| #rev = "3c795445f38317d6a0868259caf3e87916548356" | ||
| #default-features = false | ||
| #features = [ "x25519" ] |
There was a problem hiding this comment.
cc @rozbb
This no longer works due to a conflict in the zeroize versions required by cipher (1.5) and x25519-dalek as pulled in by hpke:
error: failed to select a version for `zeroize`.
... required by package `x25519-dalek v1.2.0`
... which satisfies dependency `x25519-dalek = "^1.2"` of package `hpke v0.8.0 (https://github.com/rozbb/rust-hpke?rev=3c795445f38317d6a0868259caf3e87916548356#3c795445)`
... which satisfies git dependency `hpke` of package `kem v0.1.0 (src/RustCrypto/traits/kem)`
versions that meet the requirements `=1.3` are: 1.3.0
all possible versions conflict with previously selected packages.
previously selected package `zeroize v1.5.3`
... which satisfies dependency `zeroize = "^1.5"` (locked to 1.5.3) of package `cipher v0.4.3 (/Users/bascule/src/RustCrypto/traits/cipher)`
failed to select a version for `zeroize` which could resolve this conflict
Hopefully the next releases of Dalek remove the pinning.
There was a problem hiding this comment.
Ugh that's annoying. Thanks for taking care of it. I'll re-enable once x25519-dalek v2.0 drops
tarcieri
force-pushed
the
reunify-workspace
branch
6 times, most recently
from
39f2c08 to
c8cf795
Compare
newpavlov
approved these changes
Mar 9, 2022
|
Aah yeah, good point |
Places all crates into a single Cargo workspace again. Removing the toplevel Cargo.toml when running CI on legacy pre-2021 edition crates should suffice to let them retain their current MSRV.
tarcieri
force-pushed
the
reunify-workspace
branch
from
c8cf795 to
0517415
Compare
tarcieri
added a commit
that referenced
this pull request
May 6, 2022
Now that #958 has recombined all of the crates into a single workspace, these jobs can be recombined too.
tarcieri
added a commit
that referenced
this pull request
May 6, 2022
Now that #958 has recombined all of the crates into a single workspace, these jobs can be recombined too.
tarcieri
added a commit
that referenced
this pull request
May 7, 2022
Now that #958 has recombined all of the crates into a single workspace, these jobs can be recombined too.
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.
Places all crates into a single Cargo workspace again.
Removing the toplevel Cargo.toml when running CI on legacy pre-2021 edition crates should suffice to let them retain their current MSRV.