Skip to content

Conversation

mati865
Copy link
Member

@mati865 mati865 commented Oct 16, 2019

Passed local tests.

cc potentially interested people: @gnzlbg @tlively

@rust-highfive
Copy link
Contributor

r? @alexcrichton

(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 Oct 16, 2019
@gnzlbg
Copy link
Contributor

gnzlbg commented Oct 16, 2019

@mati865 thanks, there haven't been any reported issues with libc 0.2.64 yet, so I think we can land this already.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Oct 16, 2019

📌 Commit 01008e4 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 16, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 16, 2019
Update libc to 0.2.64

Passed local tests.

cc potentially interested people: @gnzlbg @tlively
bors added a commit that referenced this pull request Oct 17, 2019
Rollup of 8 pull requests

Successful merges:

 - #65094 (Prefer statx on linux if available)
 - #65316 (make File::try_clone produce non-inheritable handles on Windows)
 - #65319 (InterpCx: make memory field public)
 - #65461 (Don't recommend ONCE_INIT in std::sync::Once)
 - #65465 (Move syntax::ext to a syntax_expand and refactor some attribute logic)
 - #65469 (Update libc to 0.2.64)
 - #65475 (add example for type_name)
 - #65478 (fmt::Write is about string slices, not byte slices)

Failed merges:

r? @ghost
@oxalica
Copy link
Contributor

oxalica commented Oct 17, 2019

Test on wasm32-unknown-emscripten failed in #65483

This special cased conversion should be removed.
https://github.com/mati865/rust/blob/libc/src/libstd/sys/unix/fs.rs#L606

These two if let become irrefutable, seems can be simply removed.
https://github.com/mati865/rust/blob/libc/src/libstd/sys/unix/fd.rs#L81
https://github.com/mati865/rust/blob/libc/src/libstd/sys/unix/fd.rs#L138

@tlively
Copy link
Contributor

tlively commented Oct 17, 2019

This failure should also be fixed by #65251.

@tlively
Copy link
Contributor

tlively commented Oct 17, 2019

I just approved #65251 and if I'm reading https://buildbot2.rust-lang.org/homu/queue/rust correctly, that PR will be merged before this one, so no change should have to be made here (unless there's a merge conflict I guess).

@mati865
Copy link
Member Author

mati865 commented Oct 17, 2019

@tlively I don't think #65251 is going to fix this specific issue. I'll look at libc changes and try to fix it.
Anyway feel free to bump libc on your PR if you wish.

@oxalica thank you for investigating the failure.

@mati865
Copy link
Member Author

mati865 commented Oct 17, 2019

Force pushed to remove test commit, this time asmjs job passed: https://dev.azure.com/rust-lang/rust/_build/results?buildId=10968

Ready to go.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Oct 17, 2019

📌 Commit 6de4924 has been approved by alexcrichton

Centril added a commit to Centril/rust that referenced this pull request Oct 19, 2019
Update libc to 0.2.64

Passed local tests.

cc potentially interested people: @gnzlbg @tlively
Centril added a commit to Centril/rust that referenced this pull request Oct 19, 2019
Update libc to 0.2.64

Passed local tests.

cc potentially interested people: @gnzlbg @tlively
@bors
Copy link
Collaborator

bors commented Oct 20, 2019

⌛ Testing commit 6de4924 with merge 7bf377f...

bors added a commit that referenced this pull request Oct 20, 2019
Update libc to 0.2.64

Passed local tests.

cc potentially interested people: @gnzlbg @tlively
@bors
Copy link
Collaborator

bors commented Oct 20, 2019

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing 7bf377f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 20, 2019
@bors bors merged commit 6de4924 into rust-lang:master Oct 20, 2019
@mati865 mati865 deleted the libc branch October 20, 2019 10:12
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.

7 participants