Skip to content

Rust: Fix semantic merge conflict #19503

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
May 16, 2025
Merged

Rust: Fix semantic merge conflict #19503

merged 1 commit into from
May 16, 2025

Conversation

hvitved
Copy link
Contributor

@hvitved hvitved commented May 15, 2025

No description provided.

@github-actions github-actions bot added the Rust Pull requests that update Rust code label May 15, 2025
@hvitved hvitved marked this pull request as ready for review May 15, 2025 19:13
@Copilot Copilot AI review requested due to automatic review settings May 15, 2025 19:13
@hvitved hvitved requested a review from a team as a code owner May 15, 2025 19:13
Copilot
Copilot AI reviewed May 15, 2025
View reviewed changes
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR resolves a semantic merge conflict in the macro expansion test by updating the expected AST node type in the PrintAst.expected file.

  • Corrects the node type in the test output from LiteralExpr to IntegerLiteralExpr

paldepind
paldepind approved these changes May 16, 2025
View reviewed changes
Copy link
Contributor

@paldepind paldepind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@hvitved hvitved merged commit 40624b2 into github:main May 16, 2025
13 checks passed
@hvitved hvitved deleted the rust/fix-semantic-merge-conflict branch May 16, 2025 07:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

Copilot code review Copilot

@paldepind paldepind

Assignees
No one assigned
Labels
Rust Pull requests that update Rust code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hvitved @paldepind