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

Account for capture kind in auto traits migration #86869

Merged
merged 2 commits into from
Jul 9, 2021

Conversation

roxelo
Copy link
Member

@roxelo roxelo commented Jul 4, 2021

Modifies the current auto traits migration for RFC2229 so it takes into account capture kind

Closes rust-lang/project-rfc-2229#51

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 4, 2021
@roxelo roxelo force-pushed the rfc2229-migration-capture-kind branch from 23bf34f to 2d1bd60 Compare July 4, 2021 19:35
@rust-log-analyzer

This comment has been minimized.

@roxelo roxelo force-pushed the rfc2229-migration-capture-kind branch from 2d1bd60 to 3e5b15e Compare July 4, 2021 20:13
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jul 5, 2021

📌 Commit 3e5b15e6f1bcce05aa5b213f4337d60e75a2cd41 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 5, 2021
@bors
Copy link
Contributor

bors commented Jul 7, 2021

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 7, 2021
@roxelo roxelo force-pushed the rfc2229-migration-capture-kind branch from 3e5b15e to 94530e3 Compare July 7, 2021 15:28
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jul 7, 2021

📌 Commit 94530e3da3013244ab5386e415f2062bdcafeebc has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 7, 2021
@nikomatsakis
Copy link
Contributor

@bors delegate+

@bors
Copy link
Contributor

bors commented Jul 7, 2021

✌️ @roxelo can now approve this pull request

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2021
…laumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#84961 (Rework SESSION_GLOBALS API)
 - rust-lang#86726 (Use diagnostic items instead of lang items for rfc2229 migrations)
 - rust-lang#86789 (Update BTreeSet::drain_filter documentation)
 - rust-lang#86838 (Checking that function is const if marked with rustc_const_unstable)
 - rust-lang#86903 (Fix small headers display)
 - rust-lang#86913 (Document rustdoc with `--document-private-items`)
 - rust-lang#86957 (Update .mailmap file)
 - rust-lang#86971 (mailmap: Add alternative addresses for myself)

Failed merges:

 - rust-lang#86869 (Account for capture kind in auto traits migration)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jul 8, 2021

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 8, 2021
@roxelo roxelo force-pushed the rfc2229-migration-capture-kind branch from 94530e3 to 7c15fc1 Compare July 8, 2021 21:08
@roxelo
Copy link
Member Author

roxelo commented Jul 8, 2021

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Jul 8, 2021

📌 Commit 7c15fc1 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 8, 2021
@bors
Copy link
Contributor

bors commented Jul 9, 2021

⌛ Testing commit 7c15fc1 with merge b090cd1...

@bors
Copy link
Contributor

bors commented Jul 9, 2021

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing b090cd1 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 9, 2021
@bors bors merged commit b090cd1 into rust-lang:master Jul 9, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Account for capture kind in trait migration
6 participants