Skip to content

Add tests for #12669 #12671

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

Merged
merged 2 commits into from
Jul 1, 2022
Merged

Add tests for #12669 #12671

merged 2 commits into from
Jul 1, 2022

Conversation

flodiebold
Copy link
Member

No description provided.

@flodiebold
Copy link
Member Author

@bors r+

betting that #12670 will merge before this 😬

@bors
Copy link
Contributor

bors commented Jul 1, 2022

📌 Commit 66c2dc3 has been approved by flodiebold

@bors
Copy link
Contributor

bors commented Jul 1, 2022

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

@bors
Copy link
Contributor

bors commented Jul 1, 2022

🔒 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 test-for-12669 (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 test-for-12669 --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-diagnostics/src/handlers/inactive_code.rs
Auto-merging crates/hir-ty/src/tests/macros.rs
CONFLICT (content): Merge conflict in crates/hir-ty/src/tests/macros.rs
Automatic merge failed; fix conflicts and then commit the result.

@flodiebold
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jul 1, 2022

📌 Commit c69e07f has been approved by flodiebold

bors added a commit that referenced this pull request Jul 1, 2022
@bors
Copy link
Contributor

bors commented Jul 1, 2022

⌛ Testing commit c69e07f with merge bf5492f...

@bors
Copy link
Contributor

bors commented Jul 1, 2022

💔 Test failed - checks-actions

@flodiebold
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jul 1, 2022

📌 Commit c712770 has been approved by flodiebold

@bors
Copy link
Contributor

bors commented Jul 1, 2022

⌛ Testing commit c712770 with merge 2eed3d2...

bors added a commit that referenced this pull request Jul 1, 2022
@bors
Copy link
Contributor

bors commented Jul 1, 2022

💔 Test failed - checks-actions

@flodiebold
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jul 1, 2022

📌 Commit dd5ac1b has been approved by flodiebold

@bors
Copy link
Contributor

bors commented Jul 1, 2022

⌛ Testing commit dd5ac1b with merge 47f28ea...

bors added a commit that referenced this pull request Jul 1, 2022
@bors
Copy link
Contributor

bors commented Jul 1, 2022

💔 Test failed - checks-actions

@flodiebold
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jul 1, 2022

📌 Commit 9a12d0d has been approved by flodiebold

@bors
Copy link
Contributor

bors commented Jul 1, 2022

⌛ Testing commit 9a12d0d with merge ec78b6b...

@bors
Copy link
Contributor

bors commented Jul 1, 2022

☀️ Test successful - checks-actions
Approved by: flodiebold
Pushing ec78b6b to master...

@bors bors merged commit ec78b6b into rust-lang:master Jul 1, 2022
@flodiebold flodiebold deleted the test-for-12669 branch July 1, 2022 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants