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.

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

Issue 6202 #6224

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Issue 6202 #6224

wants to merge 2 commits into from

Conversation

CalebLItalien
Copy link

This closes #6202 .

ytmimi
ytmimi requested changes Jul 1, 2024
View reviewed changes
Copy link
Contributor

@ytmimi ytmimi left a comment

Choose a reason for hiding this comment

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

Let's add a comment to the code and reduce the test case down to the minimum configs needed to reproduce the issue.

tests/source/issue-6202/issue_example.rs Outdated Show resolved Hide resolved
src/expr.rs Show resolved Hide resolved
ytmimi
ytmimi requested changes Jul 1, 2024
View reviewed changes
Copy link
Contributor

@ytmimi ytmimi left a comment

Choose a reason for hiding this comment

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

Just a minor nit and then I think we're good to go. Also, can you please squash all these commits and then rebase on the latest master. The team strongly discourages merge commits in PRs.

src/expr.rs Outdated Show resolved Hide resolved
@CalebLItalien CalebLItalien force-pushed the issue_6202 branch 3 times, most recently from 3ed4150 to 83af25f Compare July 1, 2024 21:44
@calebcartwright @CalebLItalien
Merge pull request rust-lang#6217 from compiler-errors/sync-from-rust…
53e290d 
…-2024-06-24

subtree-push 2024-06-24

Merge commit from master
@CalebLItalien
Copy link
Author

Apologies, was trying to squash the recent merge commit and accidentally reset the branch. This reopens the PR.

@CalebLItalien CalebLItalien reopened this Jul 4, 2024
@ytmimi
Copy link
Contributor

ytmimi commented Jul 4, 2024

The git history seems off to me. I think you might have squashed too many commits or grabbed the wrong commit message somehow?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ytmimi ytmimi ytmimi requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
pr-waiting-on-author
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Failure to split a line exceeding the maximum width
4 participants
@CalebLItalien @ytmimi @rustbot @calebcartwright