-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
Bump libc dependency of std to 0.2.88. #82731
Conversation
This comment has been minimized.
This comment has been minimized.
Hmm, the test failure seems unrelated:
|
385b2a9
to
b8c43db
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should also update Cargo.lock but otherwise LGTM (example commit: c3dedd0).
This comment has been minimized.
This comment has been minimized.
b8c43db
to
3d0916d
Compare
Right, forgot about that. Added it now. |
r? @Mark-Simulacrum for final review. |
libc v0.2.88 is released, @de-vri-es we should use the new version here. |
Yep, definitely. Updated it now. Thanks for the quick libc release :] |
3d0916d
to
c946d1d
Compare
@bors r+ rollup=iffy |
📌 Commit c946d1d has been approved by |
…-Simulacrum Bump libc dependency of std to 0.2.88. This PR bumps the `libc` dependency of `std` to 0.2.88. This will fix `TcpListener::accept` for Android on x86 platforms (rust-lang/libc@31a2777). This will really finally fix rust-lang#82400 for the main branch :) r? `@JohnTitor`
Rollup of 8 pull requests Successful merges: - rust-lang#81127 (Improve sift_down performance in BinaryHeap) - rust-lang#81879 (Added #[repr(transparent)] to core::cmp::Reverse) - rust-lang#82048 (or-patterns: disallow in `let` bindings) - rust-lang#82731 (Bump libc dependency of std to 0.2.88.) - rust-lang#82799 (Add regression test for rust-lang#75525) - rust-lang#82841 (Change x64 size checks to not apply to x32.) - rust-lang#82883 (Update Cargo) - rust-lang#82887 (Update CONTRIBUTING.md) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Don't unconditionally link libiconv on macOS. This adds `#[link(name = "iconv")]` to just the iconv symbols so that the library is only linked if the symbols are used. #2037 added a build.rs directive to always link libiconv on Apple platforms, but that shouldn't be necessary. With this change, we can see using `otool -L` that a binary that uses an `iconv` symbol links libiconv, but other binaries don't. Note that this can only be seen with a rustc prior to nightly-2021-03-09, as nightly-2021-03-10 includes rust-lang/rust#82731 which includes #2037, therefore unconditionally linking all Rust binaries to libiconv.
This PR bumps the
libc
dependency ofstd
to 0.2.88. This will fixTcpListener::accept
for Android on x86 platforms (rust-lang/libc@31a2777).This will really finally fix #82400 for the main branch :)
r? @JohnTitor