Skip to content

Resolve semantic cargo lock conflict - #9145

Merged
robert3005 merged 1 commit into
developfrom
rk/conflict
Aug 3, 2026
Merged

robert3005 merged 1 commit into
developfrom
rk/conflict

Conversation

@robert3005

Copy link
Copy Markdown
Contributor

Not sure what the granular fix is but cargo generate-lockfile reresolved it to
the right version

Signed-off-by: Robert Kruszewski <github@robertk.io>
@robert3005 robert3005 added the changelog/chore A trivial change label Aug 3, 2026
@robert3005
robert3005 enabled auto-merge (squash) August 3, 2026 10:31
@codspeed

codspeed Bot commented Aug 3, 2026

Copy link
Copy Markdown

Merging this PR will regress 2 benchmarks

⚠️ Different runtime environments detected

Some benchmarks with significant performance changes were compared across different runtime environments,
which may affect the accuracy of the results.

Open the report in CodSpeed to investigate

⚡ 27 improved benchmarks
❌ 2 regressed benchmarks
✅ 1813 untouched benchmarks
⏩ 55 skipped benchmarks1

Warning

Please fix the performance issues or acknowledge them on CodSpeed.

Performance Changes

Mode Benchmark BASE HEAD Efficiency
❌ Simulation delta_decompress_u32 522.5 µs 990.8 µs -47.27%
❌ Simulation delta_compress_u32 524.3 µs 992.8 µs -47.19%
⚡ Simulation alp_rd_compress_f64 28.3 ms 2.7 ms ×10
⚡ Simulation compress_alp[f32, (10000, 0.01, 1.0)] 253.3 µs 198.3 µs +27.7%
⚡ Simulation compress_alp[f32, (10000, 0.1, 0.95)] 311.1 µs 244.2 µs +27.43%
⚡ Simulation compress_alp[f32, (10000, 0.1, 1.0)] 266.5 µs 209.6 µs +27.13%
⚡ Simulation compress_alp[f32, (10000, 0.01, 0.25)] 263.8 µs 209.8 µs +25.77%
⚡ Simulation compress_alp[f32, (10000, 0.01, 0.95)] 265.1 µs 211.5 µs +25.36%
⚡ Simulation compress_alp[f32, (10000, 0.1, 0.25)] 302.7 µs 244.9 µs +23.64%
⚡ Simulation compress_rd[f32, (100000, 0.1)] 2.4 ms 2 ms +19.32%
⚡ Simulation compress_alp[f64, (10000, 0.1, 0.95)] 394.1 µs 331.1 µs +19.02%
⚡ Simulation compress_alp[f64, (10000, 0.1, 1.0)] 345.6 µs 291.2 µs +18.69%
⚡ Simulation compress_alp[f64, (10000, 0.01, 1.0)] 325.8 µs 274.8 µs +18.57%
⚡ Simulation compress_rd[f32, (100000, 0.01)] 2.3 ms 2 ms +18.55%
⚡ Simulation compress_rd[f32, (100000, 0.0)] 2.3 ms 2 ms +18.46%
⚡ Simulation compress_alp[f64, (10000, 0.01, 0.25)] 336.4 µs 286.4 µs +17.44%
⚡ Simulation compress_alp[f64, (10000, 0.01, 0.95)] 337.7 µs 288.7 µs +16.98%
⚡ Simulation compress_alp[f64, (10000, 0.1, 0.25)] 382.1 µs 328.2 µs +16.43%
⚡ Simulation compress_rd[f64, (100000, 0.1)] 2.9 ms 2.6 ms +14.9%
⚡ Simulation compress_rd[f64, (100000, 0.01)] 2.9 ms 2.6 ms +14.31%
... ... ... ... ... ...

ℹ️ Only the first 20 benchmarks are displayed. Go to the app to view all benchmarks.

Tip

Investigate this regression by commenting @codspeedbot fix this regression on this PR, or directly use the CodSpeed MCP with your agent.


Comparing rk/conflict (f171f65) with develop (f03d7e7)2

Open in CodSpeed

Footnotes

  1. 55 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩

  2. No successful run was found on develop (a7380c1) during the generation of this report, so f03d7e7 was used instead as the comparison base. There might be some changes unrelated to this pull request in this report. ↩

@robert3005
robert3005 merged commit 81600aa into develop Aug 3, 2026
83 of 85 checks passed
@robert3005
robert3005 deleted the rk/conflict branch August 3, 2026 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog/chore A trivial change

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants