Copy definitions from core::ffi and centralize them

[pheki]

Description

This PR removes definitions of FFI types that already exist in core and re-export them instead. The objective is to reduce duplication, to:

• Avoid making target maintainers having to change / add types in both places, potentially forgetting to update one of them.
• Avoid clashing definitions between std definitions and libc. For example, recently c_char changed from i8 to u8 for various targets, if you have a dependency that gets a *const libc::c_char and passes it to CStr::from_ptr, an older Cargo.lock will fail to compile in Rust 1.84.1 as e.g. CStr::from_ptr expects a *const i8 but libc 0.2.149 returns *const u8. This will not happen for future versions of libc if it re-exports these types from core.

Edit: after thinking more about it, do we even need to re-export these on 1.0? Can't we just remove them and let our users use core::ffi directly? (for 0.2 we still need them for backwards compatibility)

MSRV

Unfortunately, these definitions were only stabilized in core on Rust 1.84 1.64, so this would required a bump in the MSRV...

There's still no policy for MSRV, but the current value (1.83 1.63) was chosen as a conservative option due to being the one available in Debian Stable: #4040. The first freeze for the new Debian release (trixie) is scheduled to start on March and the Hard Freeze on May. Looking at the release history, it's probable that we will get the new version later this year.

So if this PR is to be approved, I'm guessing we could either merge it now or wait until Debian 13 "trixie" arrives.

Checklist

• Relevant tests in libc-test/semver have been updated: no API change
• No placeholder or unstable values like *LAST or *MAX are
  included (see #3131)
• Tested locally (cd libc-test && cargo test --target mytarget);
  especially relevant for platforms that may not be checked in CI: This impacts all targets, I only tested it for my target.

[rustbot]

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[rustbot]

Some changes occurred in solarish module

cc @jclulow, @pfmooney

Some changes occurred in OpenBSD module

cc @semarie

Some changes occurred in the Android module

cc @maurer

[tgross35]

Thank you for putting this together! I think that you are right that we should probably drop these entirely for 1.0, but don't do this now - that will probably have to be done not long before 1.0 is actually released (I am trying not to let the branches get too different so I can still feasibly diff between them).

Since this requires an MSRV change, we can't change 0.2 now as you pointed out. MSRV will be revisited after Trixie but I don't know what exactly the new minimum will be.

One concern is that we just did the big update to correct c_char; if anybody on pre-1.85 rustc has updated anything to correct for this, changing to reexport core would break them again.

@rustbot blocked

[tgross35]

I opened #4257 to track removing the reexports.

Based on the concerns above, I don't want to jump to reexporting core::ffi. I think we could still use the rest for cleanup though. Could you drop the changes to src/lib.rs and the MSRV bump? Instead, rename fixed_width_ints.rs to primitives.rs and copy the definitions from https://github.com/rust-lang/rust/blob/613bdd49978298648ed05ace086bd1ecad54b44a/library/core/src/ffi/mod.rs (without the type_alias macro).

This can then work for both branches.

[pheki]

Thank you for putting this together!

No prob! :)

Could you drop the changes to src/lib.rs and the MSRV bump? Instead, rename fixed_width_ints.rs to primitives.rs and copy the definitions from https://github.com/rust-lang/rust/blob/613bdd49978298648ed05ace086bd1ecad54b44a/library/core/src/ffi/mod.rs (without the type_alias macro).

Done! I did not copy the c_char docs as they would probably fall out of sync. I updated the module docs a bit but it may still need some improvements.

Just one clarification, I previously wrote 1.83 and 1.84, but I actually meant 1.63 and 1.64.

[tgross35]

//! The platform-specific types definitions were taken from rust-lang/rust in
//! library/core/src/ffi/primitives.rs

The file moved, and probably no need to mention MSRV here because of the other issue.

[pheki]

Done!

[tgross35]

One nit then lgtm. We should clean up intptr_t and others in a similar way, but that doesn't have to happen here.

[pheki]

Updated the docs, rebased and squashed. Tests failed for 3 targets due to files not using the prelude (the definitions were in the same file), so I fixed them in a new commit to make it easier to review.

We should clean up intptr_t and others in a similar way

Yeah, that makes sense. Specifically for intptr_t and uintptr_t I also wonder if they could be deprecated, as just like e.g. int8_t is the same as i8, they are just aliases for isize and usize.

but that doesn't have to happen here

👍

[tgross35]

Looks good, thanks for the cleanup!

[pheki]

Thanks!

[pheki]

While working at #4258 I realized something: when I copied the definitions from rustc, I accidentally removed the FIXME and used target_vendor = "apple" instead. CI passed, but do you know if that's ok? By looking at the PR that introduced it (#4202) I couldn't figure out what was the ctest issue.

One more thing, as I understood from #4256 (comment), it seems like we want to backport these (to not let the branches get too different), but I forgot to stable-nominate it, so hopefully doing it now is still ok:

@rustbot label stable-nominated

Nevermind, you added the label before merging it...

[rustbot]

Error: Label stable-nominated~~ can only be set by Rust team members

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

[tgross35]

While working at #4258 I realized something: when I copied the definitions from rustc, I accidentally removed the FIXME and used target_vendor = "apple" instead. CI passed, but do you know if that's ok? By looking at the PR that introduced it (#4202) I couldn't figure out what was the ctest issue.

ctest can be pretty surprising for what it does and doesn't accept, small syntax changes or ways of doing config make errors appear or disappear in ways I don't really understand. I'm not sure what is different here but being that CI passed, I'm not too concerned.

Error: Label stable-nominated~~ can only be set by Rust team members

🤔 it should work,

libc/triagebot.toml

Lines 2 to 7 in e8f1af4

	allow-unauthenticated = [
	"C-*",
	"O-*",
	"S-*",
	"stable-nominated",
	]

edit: oh, it's just also picking up the ~~ from your edit

[tgross35]

Some errors have started popping up with ctest complaining about target_vendor - I really can't explain it, borderline nondeterministic behavior. Anyway, I'm changing that config back here #4282.