Use the rustc_private libc less in tests #123943
Merged
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
rustbot
added
S-waiting-on-review
|
Thanks for cleaning this up! @bors r+ rollup |
bors
added
S-waiting-on-bors
aapoalas
approved these changes
Apr 15, 2024
bjorn3
reviewed
Apr 15, 2024
tests/ui/extern/extern-const.fixed
Outdated
|
|
||
| #[link(name = "rust_test_helpers", kind = "static")] | ||
| extern "C" { | ||
| static rust_dbg_static_mut: libc::c_int; //~ ERROR extern items cannot be `const` | ||
| static rust_dbg_static_mut: i32; //~ ERROR extern items cannot be `const` |
There was a problem hiding this comment.
This is defines as int on the C side, so using i32 will be incorrect on some architectures. Maybe use int32_t on the C side?
rust/tests/auxiliary/rust_test_helpers.c
Lines 242 to 243 in 5dcb678
There was a problem hiding this comment.
Fixed by using ffi::c_int.
saethlin
force-pushed
the
less-sysroot-libc
branch
from
41bda39 to
7457a0d
Compare
bors
added
S-waiting-on-author
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 15, 2024
…mpiler-errors Rollup of 4 pull requests Successful merges: - rust-lang#123900 (Stop using `PolyTraitRef` for closure/coroutine predicates already instantiated w placeholders) - rust-lang#123924 (Fix various bugs in `ty_kind_suggestion`) - rust-lang#123943 (Use the rustc_private libc less in tests) - rust-lang#123970 (zkvm: fix references to `os_str` module) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 15, 2024
Rollup merge of rust-lang#123943 - saethlin:less-sysroot-libc, r=workingjubilee Use the rustc_private libc less in tests I started looking into our use of `rustc_private` + `extern crate libc;` in tests because of rust-lang#123938 and it looks like some fraction of the users of libc simply don't need the libc crate anymore.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 18, 2024
…=jieyouxu Remove libc from more tests The goal here is to trim down the number of tests that depend on libc from the sysroot to make rust-lang#123938 more plausible. This PR is a few simple cases that I missed in rust-lang#123943.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 18, 2024
…ieyouxu Remove libc from more tests The goal here is to trim down the number of tests that depend on libc from the sysroot to make rust-lang#123938 more plausible. This PR is a few simple cases that I missed in rust-lang#123943.
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Apr 19, 2024
Remove libc from more tests The goal here is to trim down the number of tests that depend on libc from the sysroot to make rust-lang/rust#123938 more plausible. This PR is a few simple cases that I missed in rust-lang/rust#123943.
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.
I started looking into our use of
rustc_private+extern crate libc;in tests because of #123938 and it looks like some fraction of the users of libc simply don't need the libc crate anymore.