tweaks to move NLL bootstrap along#48372
Closed
nikomatsakis wants to merge 5 commits intorust-lang:masterfrom
Closed
tweaks to move NLL bootstrap along#48372nikomatsakis wants to merge 5 commits intorust-lang:masterfrom
nikomatsakis wants to merge 5 commits intorust-lang:masterfrom
Conversation
Contributor
|
r? @TimNN (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Contributor
|
I think this needs to have |
nikomatsakis
force-pushed
the
nll-bootstrap
branch
from
7fdcd47 to
555fcca
Compare
Contributor
Author
|
@TimNN done |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 555fcca has been approved by |
bors
added
S-waiting-on-bors
Contributor
Author
|
Rebased, added some more progress. |
nikomatsakis
force-pushed
the
nll-bootstrap
branch
from
555fcca to
72e45ad
Compare
Member
|
shepmaster
added
S-waiting-on-author
Collaborator
|
☔ The latest upstream changes (presumably #46882) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
|
@nikomatsakis there is a tidy lint failing and a merge conflict, could you solve those so the PR can be merged? |
Contributor
Author
|
@pietroalbini planning on getting back to this later this week |
nll requires these annotations, I believe because of rust-lang#29149
nikomatsakis
force-pushed
the
nll-bootstrap
branch
from
72e45ad to
0fb1c95
Compare
Contributor
Author
|
Gonna close this for now. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This includes two legitimate bug fixes, but one workaround.