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

Re-export core::ffi::c_void if it exists #1082

Merged
merged 1 commit into from
Sep 19, 2018

Conversation

IsaacWoods
Copy link
Contributor

@IsaacWoods IsaacWoods commented Sep 17, 2018

This is the second part of the implementation of RFC 2521, replacing the definition of c_void in libc with a re-export of the type from core::ffi::c_void on builds it exists for.

This uses the re-export for rustc version 1.31.0 or greater, as 1.30.x was the current nightly when the PR for the changes to libcore and libstd was merged, so I'm assuming the first nightly they will appear in will be 1.31.0; is this acceptable?

cc rust-lang/rust#53856

@rust-highfive
Copy link

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

Thanks! The rustc_version crate is a bit heavyweight for our purposes though. Could this perhaps use something a bit more lightweight like this?

@IsaacWoods
Copy link
Contributor Author

Done :)

I think the one Travis failure (stable, TARGET=aarch64-linux-android) is spurious, as the rest pass and it just appears to be timing out. Could someone issue a retry?

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 19, 2018

📌 Commit 79c80c4 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Sep 19, 2018

⌛ Testing commit 79c80c4 with merge d13f346...

bors added a commit that referenced this pull request Sep 19, 2018
Re-export core::ffi::c_void if it exists

This is the second part of the implementation of [RFC 2521](rust-lang/rfcs#2521), replacing the definition of `c_void` in libc with a re-export of the type from `core::ffi::c_void` on builds it exists for.

This uses the re-export for rustc version `1.31.0` or greater, as `1.30.x` was the current nightly when [the PR for the changes to libcore and libstd](rust-lang/rust#53910) was merged, so I'm assuming the first nightly they will appear in will be `1.31.0`; is this acceptable?

cc rust-lang/rust#53856
@bors
Copy link
Contributor

bors commented Sep 19, 2018

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants