Skip to content

Revert Cargo.toml union-merge driver — it mangles [[example]] blocks#236

Merged
AdaWorldAPI merged 1 commit into
masterfrom
claude/revert-cargo-union-merge
Jul 4, 2026
Merged

Revert Cargo.toml union-merge driver — it mangles [[example]] blocks#236
AdaWorldAPI merged 1 commit into
masterfrom
claude/revert-cargo-union-merge

Conversation

@AdaWorldAPI

Copy link
Copy Markdown
Owner

What / why

While resolving the chained example-PR conflict cascade, I added a .gitattributes with Cargo.toml merge=union. That was a mistake — union is the wrong tool for structured TOML and this PR removes it.

union keeps both sides of a conflict hunk line-by-line. When two branches add an [[example]] block at the same anchor, it interleaves them into a single block with two name keys:

[[example]]
name = "gridlake_field_tile"
name = "subpel_tap_tile"        # ← duplicate key → cargo refuses to parse
required-features = ["std"]

That's worse than a normal conflict — a plain 3-way merge shows clear markers you resolve by keeping both blocks intact, whereas union silently produces broken TOML (caught by CI only after the fact). It reproduced exactly this way during the last rebase of #235.

For an append-only list of multi-line blocks, plain 3-way merge is correct. Removing the driver.

Docs/tooling only — no code change.

🤖 Generated with Claude Code


Generated by Claude Code

The `Cargo.toml merge=union` .gitattributes (added while resolving the chained
example-PR conflict cascade) is the wrong tool for structured TOML. `union`
keeps both sides of a conflict hunk line-by-line, so when two branches add an
`[[example]]` block at the same anchor it interleaves them into a single block
with two `name =` keys:

    [[example]]
    name = "gridlake_field_tile"
    name = "subpel_tap_tile"        # <- duplicate key → `cargo` refuses to parse
    required-features = ["std"]

That is worse than a normal conflict (which at least shows clear markers). CI
catches it, but only after a broken merge. For an append-only list of
multi-line blocks the right resolution is a plain 3-way merge (resolve markers
by keeping both blocks intact), not a line-union. Removing the driver.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MLBnPuScZy6w9di2QEjsXM
@coderabbitai

coderabbitai Bot commented Jul 4, 2026

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

@AdaWorldAPI, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 25 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: bb734ff5-bc7d-44dd-b8e0-436d377d0897

📥 Commits

Reviewing files that changed from the base of the PR and between bbca88e and 9312f0b.

📒 Files selected for processing (1)
  • .gitattributes

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@AdaWorldAPI AdaWorldAPI merged commit 5760284 into master Jul 4, 2026
18 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