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

feat: add inlay hint support for block expr with lifetime label #17635

Merged
merged 3 commits into from
Jul 20, 2024

Conversation

Young-Flash
Copy link
Member

@Young-Flash Young-Flash commented Jul 19, 2024

block_expr_with_label

close #17582

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 19, 2024
@Young-Flash Young-Flash force-pushed the block_exp branch 2 times, most recently from 3ac1759 to 66ee618 Compare July 19, 2024 14:34
@Veykril
Copy link
Member

Veykril commented Jul 19, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Jul 19, 2024

📌 Commit 37cea54 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 19, 2024

☔ The latest upstream changes (presumably #17620) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Jul 19, 2024

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout block_exp (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self block_exp --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging crates/ide/src/inlay_hints/closing_brace.rs
CONFLICT (content): Merge conflict in crates/ide/src/inlay_hints/closing_brace.rs
Automatic merge failed; fix conflicts and then commit the result.

@lnicola
Copy link
Member

lnicola commented Jul 20, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Jul 20, 2024

📌 Commit 18e7299 has been approved by lnicola

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 20, 2024

⌛ Testing commit 18e7299 with merge 6f84bdd...

@bors
Copy link
Contributor

bors commented Jul 20, 2024

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 6f84bdd to master...

@bors bors merged commit 6f84bdd into rust-lang:master Jul 20, 2024
11 checks passed
@Young-Flash Young-Flash deleted the block_exp branch July 20, 2024 09:53
bors added a commit that referenced this pull request Aug 5, 2024
feat: support inlay hint for more expr with label

follow up #17635
lnicola pushed a commit to lnicola/rust that referenced this pull request Aug 13, 2024
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Sep 1, 2024
feat: support inlay hint for more expr with label

follow up rust-lang/rust-analyzer#17635
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.

Inline hints on closing brace of labeled blocks and loops
5 participants