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

Rename generator to coroutine #16196

Merged
merged 3 commits into from
Jan 16, 2024

Conversation

mohe2015
Copy link
Contributor

@mohe2015 mohe2015 commented Dec 25, 2023

Follow the rename in nightly (see https://blog.rust-lang.org/inside-rust/2023/10/23/coroutines.html)

This makes it much easier to test code with the nightly compiler.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 25, 2023
@Veykril Veykril added S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 2, 2024
@Veykril
Copy link
Member

Veykril commented Jan 10, 2024

The chalk changes should be published now I think, so you can adapt that

@Veykril Veykril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jan 10, 2024
@mohe2015
Copy link
Contributor Author

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 14, 2024
@Veykril
Copy link
Member

Veykril commented Jan 15, 2024

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Jan 15, 2024

📌 Commit ee1c4a3 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 15, 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 rename-generator-to-coroutine (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 rename-generator-to-coroutine --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/test-utils/src/minicore.rs
Auto-merging crates/ide-db/src/lib.rs
Auto-merging crates/ide-db/src/apply_change.rs
CONFLICT (content): Merge conflict in crates/ide-db/src/apply_change.rs
Auto-merging crates/hir/src/lib.rs
Auto-merging crates/hir-ty/src/mir/eval.rs
Auto-merging crates/hir-ty/src/mir/borrowck.rs
Auto-merging crates/hir-ty/src/mir.rs
Auto-merging crates/hir-ty/src/method_resolution.rs
Auto-merging crates/hir-ty/src/layout.rs
Auto-merging crates/hir-ty/src/infer/expr.rs
Auto-merging crates/hir-ty/src/infer/closure.rs
Auto-merging crates/hir-ty/src/infer.rs
Auto-merging crates/hir-ty/src/display.rs
Auto-merging crates/hir-ty/src/db.rs
Auto-merging crates/hir-ty/src/chalk_db.rs
Auto-merging crates/hir-ty/Cargo.toml
Auto-merging crates/hir-def/src/lang_item.rs
Auto-merging crates/hir-def/src/hir.rs
Auto-merging crates/hir-def/src/body/pretty.rs
Auto-merging crates/hir-def/src/body/lower.rs
Auto-merging Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@mohe2015 mohe2015 force-pushed the rename-generator-to-coroutine branch from ee1c4a3 to fe35447 Compare January 15, 2024 11:25
@Veykril
Copy link
Member

Veykril commented Jan 16, 2024

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Jan 16, 2024

📌 Commit fe35447 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 16, 2024

⌛ Testing commit fe35447 with merge 4de8954...

@bors
Copy link
Contributor

bors commented Jan 16, 2024

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing 4de8954 to master...

@bors bors merged commit 4de8954 into rust-lang:master Jan 16, 2024
10 checks passed
@mohe2015 mohe2015 deleted the rename-generator-to-coroutine branch January 16, 2024 08:41
@lnicola
Copy link
Member

lnicola commented Jan 20, 2024

changelog internal (first contribution) rename generator to coroutine

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.

5 participants