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.

Sign up for GitHub

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

Jump to bottom

tweaks to move NLL bootstrap along #48372

Closed
wants to merge 5 commits into from
Closed

tweaks to move NLL bootstrap along #48372

wants to merge 5 commits into from

Conversation

nikomatsakis
Copy link
Contributor

This includes two legitimate bug fixes, but one workaround.

@rust-highfive
Copy link
Collaborator

r? @TimNN

(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 Feb 20, 2018
@TimNN
Copy link
Contributor

TimNN commented Feb 20, 2018

I think this needs to have Cargo.lock regenerated?

@nikomatsakis nikomatsakis mentioned this pull request Feb 21, 2018
Closed
@nikomatsakis
Copy link
Contributor Author

@TimNN done

@TimNN
Copy link
Contributor

TimNN commented Feb 21, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Feb 21, 2018

📌 Commit 555fcca has been approved by TimNN

@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 Feb 21, 2018
@nikomatsakis
Copy link
Contributor Author

Rebased, added some more progress.

@nikomatsakis nikomatsakis mentioned this pull request Feb 28, 2018
Closed
@shepmaster
Copy link
Member 

[00:04:26] tidy error: /checkout/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs:58: line longer than 100 chars

@shepmaster shepmaster 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 Mar 3, 2018
@bors
Copy link
Contributor

bors commented Mar 8, 2018

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

@pietroalbini
Copy link
Member

@nikomatsakis there is a tidy lint failing and a merge conflict, could you solve those so the PR can be merged?

@nikomatsakis
Copy link
Contributor Author

@pietroalbini planning on getting back to this later this week

@nikomatsakis
Copy link
Contributor Author

Gonna close this for now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@TimNN TimNN

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nikomatsakis @rust-highfive @TimNN @bors @shepmaster @pietroalbini