Skip to content

Conversation

@tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 3, 2025

Backport the following:

@rustbot
Copy link
Collaborator

rustbot commented Nov 3, 2025

Some changes occurred in the Android module

cc @maurer

@rustbot
Copy link
Collaborator

rustbot commented Nov 3, 2025

⚠️ Warning ⚠️

  • Pull requests are usually filed against the main branch for this repo, but this one is against libc-0.2. Please double check that you specified the right target!

@rustbot
Copy link
Collaborator

rustbot commented Nov 3, 2025

Some changes occurred in solarish module

cc @jclulow, @pfmooney

Some changes occurred in OpenBSD module

cc @semarie

bjorn3 and others added 8 commits November 3, 2025 04:19
__error() has been deprecated and return the same value as
__errno_location(). Removing the __error() function eliminates the sole
use of thread_local in this crate.

(backport <rust-lang#3653>)
(cherry picked from commit de76fee)
[ resolved conflicts in all files and removed the now-unused
  `rustc_dep_of_std` - Trevor ]
(backport <rust-lang#4734>)
(cherry picked from commit e5b7775)
(backport <rust-lang#4746>)
(cherry picked from commit 615224f)
Rustfmt will format `()` or `[]` macro invocations that contain valid
Rust syntax, but not `{}` invocations. Switch to `()`, and update the
syntax to be valid Rust so rustfmt cleans them up.

(backport <rust-lang#4765>)
(cherry picked from commit a8b1532)
Rustfmt was skipping this entire block because it doesn't support
comments in the middle of chained `|`. So, add a `=> true` after
`IPV6_FLOWINFO_PRIORITY` and the whole closure starts to get formatted
again.

(backport <rust-lang#4765>)
(cherry picked from commit 4e4d9c2)
Move from `test/` to `tests/`, which is the directory for autodetection.
This means that we can drop `[[test]]` entries in `libc-test/Cargo.toml`
that don't require nondefault configuration like `harness = false`.

The style library had to be moved to `style_lib` so that `style` could
be used as the test name.

(backport <rust-lang#4569>)
(cherry picked from commit eab4196)
Every platform needs the `__c_anonymous` config and most need to skip
`__uint128`, so just do these in a common place.

(backport <rust-lang#4766>)
(cherry picked from commit c22bf18)
This includes `signal.h` stubs since that is a common header to import
these types.

(backport <rust-lang#4767>)
(cherry picked from commit 67f8865)
Match Apple to make it more clear what headers we want to map.

(backport <rust-lang#4768>)
(cherry picked from commit ed6645d)
Match Apple and Linux to make it more clear what headers we want to map.
Additionally, rename to `bionic_libc` since we may have others in the
future (e.g. `bionic_uapi`).

(backport <rust-lang#4770>)
(cherry picked from commit 0486b80)
There isn't any need to group these two modules.

(backport <rust-lang#4770>)
(cherry picked from commit a83905d)
Ensure each library we provide bindings for has a home module in order
to make it easier to fill things in. Where possible, I included a link
to the source tree.

There is also a new module `common` that contains definitions intended
to be shared across multiple libraries.

(backport <rust-lang#4771>)
(cherry picked from commit b295e78)
The crate has a lot of reexports and will be getting many more. Change
the formatting to vertical to reduce the possibility of conflicts.

(backport <rust-lang#4772>)
(cherry picked from commit c04afc0)
Fix duplicate exports for nuttx.

(backport <rust-lang#4773>)
(cherry picked from commit 82e3aed)
Add the missing expected traits.

(backport <rust-lang#4773>)
(cherry picked from commit d6d774f)
`target_vendor = "wali"` no longer seems to exist, so use wasm+musl to
enable the module instead.

Also fix missing types in the wali module.

(backport <rust-lang#4773>)
(cherry picked from commit 57a0228)
@rustbot
Copy link
Collaborator

rustbot commented Nov 3, 2025

Some changes occurred in OpenBSD module

cc @semarie

This flagged a changed struct in the latest version. Alignment isn't
something users should be relying upon, so ignore it globally.
@tgross35 tgross35 enabled auto-merge November 4, 2025 02:04
@tgross35 tgross35 added this pull request to the merge queue Nov 4, 2025
Merged via the queue into rust-lang:libc-0.2 with commit 6ab7fbf Nov 4, 2025
49 of 50 checks passed
@tgross35 tgross35 deleted the backport-edamame branch November 4, 2025 03:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.