[WIP] Integrate the cty crate into libc's CI #1286
Closed
Conversation
This file contains 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
Fix mixed signed / unsigned types
Add NVPTX architecture
change c_{,u}long to match libc v0.2.23 definitions
add MSP430 support
Copied a few extra definitions from the libc crate.
Include additional types from libc Copied a few extra definitions from the libc crate.
11: Re-export core::ffi::c_void r=japaric a=jeikabu japaric/cty#10 Without this trying to use bindgen like: ```rust let bindings = bindgen::Builder::default() .header("wrapper.h") .ctypes_prefix("cty") .use_core() .generate(); ``` Results in lots of: ``` error[E0308]: mismatched types --> runng/src/protocol/mod.rs:49:43 | 49 | let res = nng_setopt(socket, opt, topic_ptr, topic_size); | ^^^^^^^^^ expected enum `cty::c_void`, found enum `std::ffi::c_void` | = note: expected type `*const cty::c_void` found type `*const std::ffi::c_void` ``` Co-authored-by: jake <jeikabu@gmail.com>
|
@gnzlbg: no appropriate reviewer found, use r? to override |
|
@gnzlbg it looks like this may be an accident, but it looks like |
|
Yes that's an accident. I tried to rebase the old branch to remove the commits that added that, but somehow git rebasing does not work across the commit that merged one repository into the other. I have this on my queue, but haven't had time yet to look at it again. |
|
Ok just wanted to confirm, no worries! Apart from that looks good to me! |
|
☔ The latest upstream changes (presumably #1837) made this pull request unmergeable. Please resolve the merge conflicts. |
JohnTitor
added
S-waiting-on-review
S-waiting-on-author
and removed
S-waiting-on-review
labels
|
Closing as the author is inactive, if someone is interested in this change, let us know! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
So this the successor to #1285 (cc @japaric @Amanieu @alexcrichton ).
It imports the cty crate into the libc repository preserving its commit history, and integrates it with libc's CI. That basically amounts to running the same tests that libc runs on the cty crates type for those targets that we support at run-time (type size, alignment, sign, etc. ).
This PR also adds a crate that tests at compile-time that all types between the libc and the cty crates match except for
c_void. As @alexcrichton mentioned,c_voidmatches if both usecore::ffi::c_void, and differs otherwise because each crate defines its own in old compiler versions.WIP: while doing #1285 I noticed that the types differed in some targets because of bugs. I will manually disable the tests in the archs in which they fail (adding the appropriate comments and filling issues), so that we can decide later on a 1:1 case basis if we want to fix them, and how (we can probably fix cty bugs by just bumping the semver major version, but for libc bugs that's a different story). This PR should essentially be a non-functional change for both crates, except that
ctynow also supports older Rust targets withoutcore::ffi::c_void.