clippy, workspace deps, upgrades, fmt

Author: spanishpear

Cargo.lock

@@ -1,4 +1,3 @@
-
 [workspace]
 members  = ["crates/*"]
 resolver = "2"
@@ -24,6 +23,28 @@ resolver = "2"
   repository = "https://github.com/spanishpear/berry"
   # version = "0.1.0"
 
+  [workspace.dependencies]
+  berry-core = { path = "crates/berry-core" }
+  berry-test = { path = "crates/berry-test" }
+  # https://nodejs.org/api/n-api.html#node-api-version-matrix
+  # support node 18-22
+  clap = { version = "4.5.45", features = ["derive"] }
+  criterion = { version = "0.7", features = ["html_reports"] }
+  memory-stats = { version = "1.2.0" }
+  napi = { version = "3.2.4", default-features = false, features = ["napi9"] }
+  napi-derive = { version = "3.2.4", default-features = false, features = [
+    "type-def",
+  ] }
+  nom = { version = "8.0.0" }
+  rstest = { version = "0.26" }
+  serde = { version = "1.0", features = ["derive"] }
+  serde_json = { version = "1.0" }
+
+  [workspace.dev-dependencies]
+  pretty_assertions = { version = "1.4" }
+  rstest            = { version = "0.26" }
+
+
   # https://doc.rust-lang.org/rustc/lints/groups.html
   [workspace.lints.rust]
   deprecated-safe         = "warn"
@@ -46,23 +67,13 @@ resolver = "2"
   pedantic = { level = "warn", priority = -1 } # default is "allow"
   # Now, allow ones we want to ignore
   cargo_common_metadata = "allow"
+  cast_precision_loss   = "allow" # not super important right now
   implicit_return       = "allow" # Prefer idiomatic rust
   missing_const_for_fn  = "allow"
   missing_errors_doc    = "allow"
   missing_panics_doc    = "allow"
   must_use_candidate    = "allow"
 
-  [workspace.dependencies]
-  # https://nodejs.org/api/n-api.html#node-api-version-matrix
-  # support node 18-22
-  napi = { version = "3.0.0-alpha", default-features = false, features = [
-    "napi9",
-  ] }
-  napi-derive = { version = "3.0.0-alpha", default-features = false, features = [
-    "type-def",
-  ] }
-  nom = "8.0.0"
-
 [profile.release]
 codegen-units = 1
 lto           = true

Cargo.toml

@@ -1,38 +1,30 @@
 # Berry - High-Performance Yarn Lockfile Parser
 
-A high-performance, zero-allocation parser for Yarn v3/v4 lockfiles, built with Rust and nom. This parser focuses on idiomatic Rust, modularity, and performance for future use in WASM or with napi-rs.
+A high-performance parser for Yarn v3/v4 lockfiles, built with Rust and nom. This parser focuses on performance, with minimal allocation and future use in WASM or with napi-rs.
 
-## 🚀 Features
-
-- **Zero-Allocation Parsing**: Minimal memory allocations during parsing phase
-- **High Performance**: Sub-millisecond parsing for most lockfiles
-- **Comprehensive Support**: Handles all major Yarn v3/v4 lockfile features
-- **Memory Efficient**: Optimized for minimal heap usage
-- **Production Ready**: Comprehensive test coverage and benchmarking
-
-## 📊 Performance
+## Performance
 
 The parser is designed for high performance with minimal memory usage:
 
-- **Small files** (~1KB): ~6-7 microseconds
-- **Medium files** (~2KB): ~2-3 microseconds
-- **Large files** (~40KB): ~5 microseconds
-- **Memory usage**: Typically 0-20KB heap usage depending on fixture complexity
+- Small files (~1KB): ~6-7 microseconds
+- Medium files (~2KB): ~2-3 microseconds
+- Large files (~40KB): ~5 microseconds
+- Memory usage: Typically 0-20KB heap usage depending on fixture complexity
 
-## 🏗️ Architecture
+## Architecture
 
 ```
 crates/
 ├── berry-core/          # Main parser library
 ├── berry-test/          # Integration tests
 ├── berry-bench/         # Criterion microbenchmarks
 ├── berry-bench-bin/     # CLI benchmarking tool
-└── node-bindings/       # Node.js bindings (planned)
+└── node-bindings/       # Node.js bindings (WIP)
 ```
 
-## 🧪 Benchmarking
+## Benchmarking
 
-The project includes comprehensive benchmarking infrastructure for performance monitoring and regression detection.
+The project includes basic benchmarking infrastructure for performance monitoring and regression detection. Claude wrote that part, apologies.
 
 ### Quick Performance Testing
 
@@ -59,12 +51,12 @@ cargo bench --package berry-bench --bench parser_benchmarks -- --quick
 
 ### Benchmark Categories
 
-- **Fixture Parsing**: Different file sizes and complexities
-- **Memory Usage**: Heap usage tracking and analysis
-- **Zero-Allocation Validation**: Memory allocation verification
-- **Input Characteristics**: Various lockfile formats and features
+- Fixture Parsing: Different file sizes and complexities
+- Memory Usage: Heap usage tracking and analysis
+- Zero-Allocation Validation: Memory allocation verification
+- Input Characteristics: Various lockfile formats and features
 
-## 🛠️ Development
+## Development
 
 ### Prerequisites
 
@@ -104,7 +96,7 @@ cargo clippy --workspace
 cargo fmt --workspace
 ```
 
-## 📁 Project Structure
+## Project Structure
 
 ### Core Parser (`crates/berry-core/`)
 
@@ -127,9 +119,9 @@ cargo fmt --workspace
 - Memory usage tracking and heap analysis
 - Performance regression detection
 
-## 🎯 Current Status
+## Current Status
 
-✅ **Production Ready**
+- Production Ready
 
 - All tests passing (23/23)
 - Zero clippy warnings
@@ -138,31 +130,31 @@ cargo fmt --workspace
 - Modern nom API usage
 - Comprehensive test coverage
 
-🔄 **In Development**
+- In Development
 
 - Advanced lockfile features (multi-descriptors, meta fields)
 - WASM compilation support
 - Node.js bindings with napi-rs
 - CI/CD benchmarking pipeline
 
-## 📈 Performance Monitoring
+## Performance Monitoring
 
 The benchmarking infrastructure automatically detects:
 
-- **Performance regressions** (>50% slower than baseline)
-- **Statistical significance** in benchmark results
-- **Memory usage patterns** and allocation tracking
-- **Zero-allocation violations** during parsing
+- Performance regressions (>50% slower than baseline)
+- Statistical significance in benchmark results
+- Memory usage patterns and allocation tracking
+- Zero-allocation violations during parsing
 
-## 🤝 Contributing
+## Contributing
 
 See [CONTRIBUTING.md](dev-docs/CONTRIBUTING.md) for development guidelines and benchmarking information.
 
-## 📄 License
+## License
 
 MIT OR Apache-2.0
 
-## 🔗 Links
+## Links
 
 - [Task List](.cursor/tasks/BERRY_LOCKFILE_PARSER.md) - Detailed development progress
 - [Benchmarking Plan](.cursor/tasks/BENCHMARKING_PLAN.md) - Comprehensive benchmarking strategy

README.md

@@ -7,12 +7,12 @@ repository.workspace = true
 version.workspace    = true
 
 [dependencies]
-berry-core   = { path = "../berry-core" }
-berry-test   = { path = "../berry-test" }
-clap         = { version = "4.0", features = ["derive"] }
-memory-stats = "1.1"
-serde        = { version = "1.0", features = ["derive"] }
-serde_json   = "1.0"
+berry-core   = { workspace = true }
+berry-test   = { workspace = true }
+clap         = { workspace = true }
+memory-stats = { workspace = true }
+serde        = { workspace = true }
+serde_json   = { workspace = true }
 
 [lints]
 workspace = true

crates/berry-bench-bin/Cargo.toml

@@ -112,8 +112,10 @@ fn benchmark_fixture(
   let result = parse_lockfile(&fixture);
   let after = memory_stats().unwrap();
 
-  let heap_usage = after.physical_mem - before.physical_mem;
-  let virtual_usage = after.virtual_mem - before.virtual_mem;
+  let heap_usage = isize::try_from(after.physical_mem).expect("physical mem too large")
+    - isize::try_from(before.physical_mem).expect("physical mem too large");
+  let virtual_usage = isize::try_from(after.virtual_mem).expect("virtual mem too large")
+    - isize::try_from(before.virtual_mem).expect("virtual mem too large");
 
   assert!(result.is_ok(), "Should parse {fixture_name} successfully");
 
@@ -158,8 +160,8 @@ fn benchmark_fixture(
     max_time_ms: max,
     std_dev_ms: std_dev,
     runs,
-    heap_usage_bytes: Some(heap_usage),
-    virtual_usage_bytes: Some(virtual_usage),
+    heap_usage_bytes: Some(heap_usage.unsigned_abs()),
+    virtual_usage_bytes: Some(virtual_usage.unsigned_abs()),
     time_per_kib_ms,
     mb_per_s,
   }
@@ -237,7 +239,10 @@ fn discover_all_fixture_names() -> Vec<String> {
       let entry = entry.ok()?;
       let path = entry.path();
       if path.extension()?.to_str()? == "lock" {
-        path.file_name()?.to_str().map(|s| s.to_string())
+        path
+          .file_name()?
+          .to_str()
+          .map(std::string::ToString::to_string)
       } else {
         None
       }
@@ -347,15 +352,15 @@ fn main() {
         std::process::exit(1);
       }
     } else {
-      eprintln!("Could not load baseline from {}", baseline_path);
+      eprintln!("Could not load baseline from {baseline_path}");
     }
   }
 
   if let Some(save_path) = &args.save_baseline {
     if let Err(err) = save_baseline(save_path, &results) {
-      eprintln!("Failed to save baseline to {}: {}", save_path, err);
+      eprintln!("Failed to save baseline to {save_path}: {err}");
     } else if args.verbose {
-      println!("Saved baseline to {}", save_path);
+      println!("Saved baseline to {save_path}");
     }
   }
 }

crates/berry-bench-bin/src/main.rs

@@ -7,14 +7,14 @@ repository.workspace = true
 version.workspace    = true
 
 [dependencies]
-berry-core   = { path = "../berry-core" }
-berry-test   = { path = "../berry-test" }
-criterion    = { version = "0.5", features = ["html_reports"] }
-memory-stats = "1.1"
+berry-core   = { workspace = true }
+berry-test   = { workspace = true }
+criterion    = { workspace = true }
+memory-stats = { workspace = true }
 
 [[bench]]
 harness = false
 name    = "parser_benchmarks"
 
 [dev-dependencies]
-criterion = { version = "0.5", features = ["html_reports"] }
+criterion = { workspace = true }

crates/berry-bench/Cargo.toml

@@ -299,7 +299,7 @@ fn benchmark_all_fixtures(c: &mut Criterion) {
 
   for fixture_name in fixtures {
     let fixture = load_fixture(&fixture_name);
-    let label = format!("{}", fixture_name.replace('.', "_").replace('-', "_"));
+    let label = fixture_name.replace(['.', '-'], "_").to_string();
     group.bench_function(label, |b| {
       b.iter(|| {
         let result = parse_lockfile(black_box(&fixture));

crates/berry-bench/benches/parser_benchmarks.rs

@@ -8,10 +8,7 @@ repository.workspace = true
 version              = "0.1.0"
 
 [dependencies]
-nom = "8.0.0"
-
-[dev-dependencies]
-berry-test = { path = "../berry-test" }
+nom = { workspace = true }
 
 [lints]
 workspace = true

crates/berry-core/Cargo.toml

@@ -118,8 +118,7 @@ impl Range {
       Some("exec") => Protocol::Exec,
       Some("link") => Protocol::Link,
       Some(p) if p.starts_with("git") => Protocol::Git,
-      Some(_) => Protocol::Unknown,
-      None => Protocol::Unknown,
+      Some(_) | None => Protocol::Unknown,
     }
   }
 
@@ -177,11 +176,9 @@ impl Range {
       Protocol::Git => {
         // Return full URL including scheme (e.g., git+ssh://...), not just selector
         let raw = self.raw();
-        if let Some(pos) = raw.find('#') {
+        raw.find('#').map_or(Some((raw, None)), |pos| {
           Some((&raw[..pos], Some(&raw[pos + 1..])))
-        } else {
-          Some((raw, None))
-        }
+        })
       }
       _ => None,
     }
@@ -192,11 +189,9 @@ impl Range {
     match self.protocol() {
       Protocol::Patch => {
         let sel = self.selector();
-        if let Some(pos) = sel.find('#') {
+        sel.find('#').map_or(Some((sel, None)), |pos| {
           Some((&sel[..pos], Some(&sel[pos + 1..])))
-        } else {
-          Some((sel, None))
-        }
+        })
       }
       _ => None,
     }

crates/berry-core/src/ident.rs

@@ -192,9 +192,9 @@ mod tests_parse_r_c {
 
   #[test]
   fn test_parse_top_level_constraints_block() {
-    let input = r#"constraints:
+    let input = r"constraints:
   react@^18: npm:^18.2.0
-"#;
+";
     let (rest, constraints) = parse_constraints(input).expect("parse constraints");
     assert!(rest.is_empty());
     assert_eq!(constraints.len(), 1);