Skip to content

fix: repair corrupted Cargo.lock with duplicate package entries#674

Merged
yoshuawuyts merged 4 commits into
mainfrom
yoshuawuyts/fix-corrupted-cargo-lock
Jun 1, 2026
Merged

fix: repair corrupted Cargo.lock with duplicate package entries#674
yoshuawuyts merged 4 commits into
mainfrom
yoshuawuyts/fix-corrupted-cargo-lock

Conversation

@yoshuawuyts
Copy link
Copy Markdown
Member

The root Cargo.lock contained duplicate [[package]] entries (wasm-metadata 0.230.0 x5, wasmparser 0.245.1 x2) from Dependabot bump PRs merged without re-resolving the lockfile. This made 'cargo build --workspace' fail to parse the lockfile, breaking CI on main. Regenerate the lockfile so each package resolves once and matches Cargo.toml constraints (e.g. testcontainers ^0.25.2).

The root Cargo.lock contained duplicate [[package]] entries (wasm-metadata
0.230.0 x5, wasmparser 0.245.1 x2) from Dependabot bump PRs merged without
re-resolving the lockfile. This made 'cargo build --workspace' fail to parse
the lockfile, breaking CI on main. Regenerate the lockfile so each package
resolves once and matches Cargo.toml constraints (e.g. testcontainers ^0.25.2).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@yoshuawuyts yoshuawuyts requested a review from Copilot May 31, 2026 15:59
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.

yoshuawuyts and others added 2 commits May 31, 2026 18:01
Split a merged 'pub use {mcp_server, wassette};' re-export into separate
statements to satisfy 'cargo +nightly fmt --check', which CI enforces.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The [dev-dependencies] pinned oci-client 0.15 / oci-wasm 0.3 (added in the
original OCI feature and never bumped), while the workspace dependencies were
later moved to oci-client 0.16 / oci-wasm 0.4 by Dependabot. This pulled two
versions of oci-client into the test build, so transport_integration_test
passed an oci_client 0.15 Client to wassette::with_oci_client which expects
the 0.16 type (E0308). The corrupted lockfile had been masking this by failing
the build earlier. Align the dev-dependencies to 0.16 / 0.4 so a single version
is used.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Run cargo update to fix: aws-lc-sys (0.36→0.41), quinn-proto (0.11.13→0.11.14),
  wasmtime (36.0.5→36.0.10), rustls-webpki (0.103.9→0.103.13), rsa removed
- Upgrade testcontainers 0.25→0.27 in Cargo.toml to fix astral-tokio-tar advisories
- Create .cargo/audit.toml (correct location for cargo-audit config) with ignore
  entries for unfixable rustls-webpki 0.102.8 advisories (wasmtime 36.x internal dep)
- Update deny.toml: remove rustls-pemfile entry (dep removed), add rustls-webpki ignores

Co-authored-by: yoshuawuyts <2467194+yoshuawuyts@users.noreply.github.com>
@yoshuawuyts yoshuawuyts merged commit 2a21329 into main Jun 1, 2026
16 checks passed
@yoshuawuyts yoshuawuyts deleted the yoshuawuyts/fix-corrupted-cargo-lock branch June 1, 2026 01:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants