Skip to content

improve [match_same_arms] messages, enable rustfix test#12794

Merged
bors merged 1 commit into
rust-lang:masterfrom
J-ZhengLi:issue9251
May 14, 2024
Merged

improve [match_same_arms] messages, enable rustfix test#12794
bors merged 1 commit into
rust-lang:masterfrom
J-ZhengLi:issue9251

Conversation

@J-ZhengLi
Copy link
Copy Markdown
Contributor

closes: #9251

don't worry about the commit size, most of them are generated


changelog: improve [match_same_arms] lint messages

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 13, 2024

r? @blyxyas

rustbot has assigned @blyxyas.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label May 13, 2024
"",
appl,
)
.help("or try changing either arm body");
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

is there a way to ensure the help message is printed after the suggestions?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Seems like the suggestions are printed after any non-suggestion messages. You can try rephrasing the help messages taking that into account

Copy link
Copy Markdown
Member

@blyxyas blyxyas left a comment

Choose a reason for hiding this comment

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

LGTM, thanks! ❤️
Could you rephrase the help messages?

"",
appl,
)
.help("or try changing either arm body");
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Seems like the suggestions are printed after any non-suggestion messages. You can try rephrasing the help messages taking that into account

@blyxyas
Copy link
Copy Markdown
Member

blyxyas commented May 13, 2024

I've manually done it (I was bored and wanted to take this through the finish line, being that such an easy-to-solve issue was blocking it)

@bors r+

@bors
Copy link
Copy Markdown
Contributor

bors commented May 13, 2024

📌 Commit dc5b99b has been approved by blyxyas

It is now in the queue for this repository.

@bors
Copy link
Copy Markdown
Contributor

bors commented May 13, 2024

⌛ Testing commit dc5b99b with merge 4833970...

bors added a commit that referenced this pull request May 13, 2024
improve [`match_same_arms`] messages, enable rustfix test

closes: #9251

don't worry about the commit size, most of them are generated

---

changelog: improve [`match_same_arms`] lint messages
@bors
Copy link
Copy Markdown
Contributor

bors commented May 13, 2024

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: blyxyas
Pushing 4833970 to master...

@bors
Copy link
Copy Markdown
Contributor

bors commented May 13, 2024

👀 Test was successful, but fast-forwarding failed: 422 1 review requesting changes by reviewers with write access.

@J-ZhengLi
Copy link
Copy Markdown
Contributor Author

I've manually done it (I was bored and wanted to take this through the finish line, being that such an easy-to-solve issue was blocking it)

@bors r+

Thanks! that'll do

I was too tired back then, and was trying to think of some better help message but ended up fall asleep 🤦‍♂️

As of the failed test, I've encounter the exactly problem in the past with Alexendoo iirc, it was strange, ended up re-open another PR to solve it, I'll try change the commit message to see if that goes away

@y21
Copy link
Copy Markdown
Member

y21 commented May 13, 2024

I think this happens because of the "requested changes" review. You need to dismiss that (or blyxyas needs to approve it) before bors will merge it. Like here: #12107 (comment)

@J-ZhengLi
Copy link
Copy Markdown
Contributor Author

I think this happens because of the "requested changes" review. You need to dismiss that (or blyxyas needs to approve it) before bors will merge it. Like here: #12107 (comment)

did a quick google search and it's telling me that you need write access to dismiss it, well I guess I'll have to rely on blyxyas then 😸

@blyxyas
Copy link
Copy Markdown
Member

blyxyas commented May 14, 2024

@bors r+

@bors
Copy link
Copy Markdown
Contributor

bors commented May 14, 2024

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors
Copy link
Copy Markdown
Contributor

bors commented May 14, 2024

📌 Commit dc5b99b has been approved by blyxyas

It is now in the queue for this repository.

@bors
Copy link
Copy Markdown
Contributor

bors commented May 14, 2024

⌛ Testing commit dc5b99b with merge a863780...

@bors
Copy link
Copy Markdown
Contributor

bors commented May 14, 2024

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: blyxyas
Pushing a863780 to master...

@bors bors merged commit a863780 into rust-lang:master May 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties

Projects

None yet

Development

Successfully merging this pull request may close these issues.

match-same-arms doesn't delete the old arm when merging

5 participants