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

Remove in_band_lifetimes from rustc_borrowck #91879

Merged
merged 1 commit into from
Dec 17, 2021

Conversation

bugadani
Copy link
Contributor

See #91867 for more information.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 13, 2021
@rust-highfive
Copy link
Collaborator

r? @wesleywiser

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 13, 2021
@wesleywiser
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 14, 2021

📌 Commit 0c594f8 has been approved by wesleywiser

@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 Dec 14, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 14, 2021
…wiser

Remove `in_band_lifetimes` from `rustc_borrowck`

See rust-lang#91867 for more information.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 14, 2021
…wiser

Remove `in_band_lifetimes` from `rustc_borrowck`

See rust-lang#91867 for more information.
@bors
Copy link
Contributor

bors commented Dec 15, 2021

☔ The latest upstream changes (presumably #91945) 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 Dec 15, 2021
@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Dec 15, 2021
@bugadani bugadani force-pushed the in_band_borrowck branch 2 times, most recently from 40696d4 to 56897a4 Compare December 15, 2021 07:38
@bugadani
Copy link
Contributor Author

@rustbot label -S-waiting-on-author +S-waiting-on-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 Dec 15, 2021
@wesleywiser
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 16, 2021

📌 Commit e837101 has been approved by wesleywiser

@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 Dec 16, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 16, 2021
…wiser

Remove `in_band_lifetimes` from `rustc_borrowck`

See rust-lang#91867 for more information.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 16, 2021
…wiser

Remove `in_band_lifetimes` from `rustc_borrowck`

See rust-lang#91867 for more information.
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2021
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#91172 (Warn when a `#[test]`-like built-in attribute macro is present multiple times.)
 - rust-lang#91796 (Fix since attribute for const_manually_drop feature)
 - rust-lang#91879 (Remove `in_band_lifetimes` from `rustc_borrowck`)
 - rust-lang#91947 (Add `io::Error::other`)
 - rust-lang#91967 (Pull in libdevstat on FreeBSD)
 - rust-lang#91987 (Add module documentation for rustdoc passes)
 - rust-lang#92001 (Fix default_method_body_is_const when used across crates)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7e5c071 into rust-lang:master Dec 17, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 17, 2021
@bugadani bugadani deleted the in_band_borrowck branch December 17, 2021 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants