Skip to content

Remove redundant dependencies and use crossbeam-channel directly - #962

Merged
rphmeier merged 1 commit into
thrumdev:masterfrom
citizen-stig:dependency-cleanup
Nov 13, 2026
Merged

rphmeier merged 1 commit into
thrumdev:masterfrom
citizen-stig:dependency-cleanup

Conversation

@citizen-stig

@citizen-stig citizen-stig commented Oct 26, 2026 •

Copy link
Copy Markdown
Contributor

Dependency cleanup

  • Use crossbeam-channel directly instead of crossbeam (nomt/src/merkle, nomt/src/rollback). Import-only change.
  • Remove unused dependencies: crossbeam, ahash, nomt's direct serde (the serde feature now only forwards to nomt-core/serde), and the criterion dev-dependency of nomt.
  • digest: default-features = false.

Fix master build: keep parking_lot 0.12

Master is currently red. It has parking_lot 0.13 (1d6271d) and also calls RwLock::read_recursive / read_arc_recursive (0e2dd95, nomt/src/lib.rs). 0.13 removed those methods in favour of a reader-biased RecursiveRwLock, which would let overlapping sessions starve commits and break the queued-commit tests. This PR pins parking_lot back to 0.12 (Cargo.toml, Cargo.lock, benchtop/Cargo.lock) with no code change.

Known gap in the current scheme, not addressed here: the "thread already holds a session" check is thread-local, while Session is Send, so a session moved to another thread (e.g. a tokio task resumed on another worker) that then opens a second session while a commit is queued still deadlocks.

Verification

  • CI green: test, loom rw_pass_cell, doc, fmt, darwin check, benchtop check and run.
  • Locally: cargo check -p nomt --features serde.

🤖 Generated with Claude Code

https://claude.ai/code/session_017wb3qEb9s85Xcvox5EGTca

@thrumdev thrumdev locked and limited conversation to collaborators Nov 9, 2026
@thrumdev thrumdev unlocked this conversation Nov 9, 2026
@rphmeier
rphmeier merged commit 8ec0c2c into thrumdev:master Nov 13, 2026
7 checks passed
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