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

Update libc to 0.2.39 #48859

Merged
merged 1 commit into from
Mar 14, 2018
Merged

Update libc to 0.2.39 #48859

merged 1 commit into from
Mar 14, 2018

Conversation

bdrewery
Copy link
Contributor

@bdrewery bdrewery commented Mar 9, 2018

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 9, 2018

📌 Commit ebfdb5f has been approved by alexcrichton

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 9, 2018
@bdrewery
Copy link
Contributor Author

bdrewery commented Mar 9, 2018

@Mark-Simulacrum I think this should just be "CC" rather than "Fixes" for #42681 since the bootstrap is a piece that needs to be updated to fully fix the problem. Thanks for reopening it.

@Mark-Simulacrum
Copy link
Member

You mean we need to backport to beta and bootstrap from that beta?

@bdrewery
Copy link
Contributor Author

I don't know the process for updating the beta but I wasn't going to push to update it for #42681. I think waiting for other reasons is fine. I assume that whatever the next update is would use whatever the current libc is from master right?

@Mark-Simulacrum
Copy link
Member

Releasing a new beta is trivial, and if simply backporting a libc bump to beta is enough to fix what looks like a somewhat painful regression, then we should do it. Once that's done we can update master to boostrap from that beta instead of the original beta.

@bors
Copy link
Contributor

bors commented Mar 11, 2018

🔒 Merge conflict

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

bors commented Mar 11, 2018

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

@bdrewery
Copy link
Contributor Author

Merge conflict resolved via rebase, now only libc submodule updated.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 12, 2018

📌 Commit c63d5e0 has been approved by alexcrichton

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

bors commented Mar 14, 2018

⌛ Testing commit c63d5e0 with merge 24e679c...

bors added a commit that referenced this pull request Mar 14, 2018
@bors
Copy link
Contributor

bors commented Mar 14, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 24e679c to master...

@bors bors merged commit c63d5e0 into rust-lang:master Mar 14, 2018
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants