Skip to content

Fix broken nbtx - #879

Merged
louis-e merged 1 commit into
mainfrom
nbtx-fix
Apr 4, 2026
Merged

louis-e merged 1 commit into
mainfrom
nbtx-fix

Conversation

@louis-e

@louis-e louis-e commented Apr 4, 2026

Copy link
Copy Markdown
Owner

No description provided.

Copilot AI review requested due to automatic review settings April 4, 2026 11:09
@louis-e
louis-e merged commit 2d2efbc into main Apr 4, 2026
4 checks passed
@louis-e
louis-e deleted the nbtx-fix branch April 4, 2026 11:09

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR aims to fix the Bedrock export dependency stack (per title “Fix broken nbtx”) by stabilizing Bedrock-related Rust dependencies and updating the resolved dependency graph.

Changes:

  • Pin bedrockrs_level / bedrockrs_shared to a specific upstream git revision.
  • Downgrade rusty-leveldb to v3 for the bedrock feature.
  • Regenerate Cargo.lock, resulting in a large set of dependency version changes.

Reviewed changes

Copilot reviewed 1 out of 2 changed files in this pull request and generated 1 comment.

File Description
Cargo.toml Pins bedrock-rs git deps to a commit and switches rusty-leveldb to v3 for Bedrock feature builds.
Cargo.lock Updates the resolved dependency set (including nbtx commit/version change and many unrelated transitive updates).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread Cargo.toml
bedrockrs_shared = { git = "https://github.com/bedrock-crustaceans/bedrock-rs", package = "bedrockrs_shared", optional = true }
bedrockrs_level = { git = "https://github.com/bedrock-crustaceans/bedrock-rs", rev = "7ef268b", package = "bedrockrs_level", optional = true }
bedrockrs_shared = { git = "https://github.com/bedrock-crustaceans/bedrock-rs", rev = "7ef268b", package = "bedrockrs_shared", optional = true }
nbtx = { git = "https://github.com/bedrock-crustaceans/nbtx", optional = true }

Copilot AI Apr 4, 2026

Copy link

Choose a reason for hiding this comment

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

nbtx is still a floating git dependency (no rev/tag), while bedrockrs_* is pinned. To keep Bedrock builds reproducible and avoid future breakages when the nbtx repo updates, pin nbtx to a known-good rev (ideally matching the commit recorded in Cargo.lock).

Suggested change
nbtx = { git = "https://github.com/bedrock-crustaceans/nbtx", optional = true }
nbtx = { git = "https://github.com/bedrock-crustaceans/nbtx", rev = "REPLACE_WITH_NBTX_COMMIT_FROM_CARGO_LOCK", optional = true }

Copilot uses AI. Check for mistakes.
@github-actions

github-actions Bot commented Apr 4, 2026

Copy link
Copy Markdown

⏱️ Benchmark run finished in 2m 4s
🧠 Peak memory usage: 1637 MB

📈 Compared against baseline: 30s
🧮 Delta: 94s
🔢 Commit: a270f2e

🚨 This PR drastically worsens generation time.

📅 Last benchmark: 2026-04-04 11:13:55 UTC

You can retrigger the benchmark by commenting retrigger-benchmark.

louis-e added a commit that referenced this pull request Apr 4, 2026
Resolve conflicts in Cargo.toml and Cargo.lock: keep main's nbtx
(no rev pin, already fixed in main via #879).

Co-Authored-By: Claude Opus 4.6 <[email protected]>
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.

2 participants