Fix merge conflicts and compilation errors#9
Merged
johnzfitch merged 1 commit intomainfrom Mar 12, 2026
Merged
Conversation
Resolved unresolved merge conflict markers in ops.rs and commands.rs that prevented the project from compiling. These conflicts were left over from previous merges and included duplicate code sections and syntax errors. Changes: - Remove duplicate PermissionsExt import in ops.rs - Add missing MIN_VAULT_VERSION import - Add Zeroize trait import for explicit .zeroize() calls - Remove duplicate key commitment function definition - Fix type dereferencing in derive_wrapping_keys (*mlkem_key, *x25519_key) - Fix X25519 key type conversion with explicit TryInto - Make compute_key_commitment pub(crate) for migration module access - Fix syntax error in commands.rs match statement (removed extra ')') - Remove merge conflict markers (<<<<<<< HEAD, ======, etc.) The binary now compiles successfully and all tests pass.
Contributor
There was a problem hiding this comment.
Pull request overview
Resolves build breaks introduced by incomplete merge conflict resolution by cleaning up Rust sources in the vault ops layer and CLI handlers, restoring successful compilation and enabling migrations to call into shared vault helpers.
Changes:
- Cleaned up
src/vault/ops.rsby removing duplicate sections/imports, fixing key derivation/type conversions, and exposingcompute_key_commitmentto the migration module. - Fixed a syntax error in
src/cli/commands.rs(handle_set) by correcting the match expression terminator.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/vault/ops.rs |
Removes duplicate code/imports, fixes key wrapping derivation and X25519 key conversions, and makes key-commitment helper available to migrations. |
src/cli/commands.rs |
Fixes match/closure terminator syntax to restore compilation for handle_set. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
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.
Summary
Changes
PermissionsExtimport and key commitment functionMIN_VAULT_VERSIONandZeroizetrait importsderive_wrapping_keysfunctioncompute_key_commitmentpub(crate) for migration moduleTest Plan
cargo build --releaseImpact
This PR unblocks all development by fixing critical build errors introduced by incomplete merge conflict resolution.