Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

parser-state: fix attribute merging (backport #11294) #12210

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2025

Motivation

Fixes #11268.

Context

This should be non-breaking. As a side effect, it makes some duplicate attribute error messages nicer (later occurrences point back to previous occurrences rather than the other way around).

I'm working at the edge of my proficiency with C++ here, so please take extra care to verify that how I'm handling pointers and memory management is sensible, because I'm not confident that I'm doing it right.

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #11294 done by [Mergify](https://mergify.com).

(cherry picked from commit 8034589)
@mergify mergify bot added the merge-queue label Jan 10, 2025
@mergify mergify bot requested a review from edolstra as a code owner January 10, 2025 10:40
@github-actions github-actions bot added the with-tests Issues related to testing. PRs with tests have some priority label Jan 10, 2025
mergify bot added a commit that referenced this pull request Jan 10, 2025
@mergify mergify bot merged commit 08cd0ac into 2.25-maintenance Jan 10, 2025
23 checks passed
@mergify mergify bot deleted the mergify/bp/2.25-maintenance/pr-11294 branch January 10, 2025 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-queue with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant