Skip to content
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

Fix c_char on AIX #122986

Merged
merged 1 commit into from
May 26, 2024
Merged

Fix c_char on AIX #122986

merged 1 commit into from
May 26, 2024

Conversation

taiki-e
Copy link
Member

@taiki-e taiki-e commented Mar 24, 2024

Closes #122985

@rustbot
Copy link
Collaborator

rustbot commented Mar 24, 2024

r? @scottmcm

rustbot has assigned @scottmcm.
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 rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Mar 24, 2024
@bjorn3
Copy link
Member

bjorn3 commented Mar 24, 2024

cc @ecnelises and @bzEq as target maintainers

@scottmcm
Copy link
Member

Re-rolling to hopefully get someone with target experience:
r? libs

@rustbot rustbot assigned m-ou-se and unassigned scottmcm Mar 27, 2024
@Mark-Simulacrum
Copy link
Member

r? @Mark-Simulacrum

@rustbot author (while libc is merged)

Per rust-lang/libc#3631 (comment), it looks like target maintainers are happy with this change, and our policy is that no further review for tier-3 targets is required.

@rustbot rustbot assigned Mark-Simulacrum and unassigned m-ou-se Mar 28, 2024
@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 28, 2024
@Dylan-DPC Dylan-DPC added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 4, 2024
@taiki-e
Copy link
Member Author

taiki-e commented May 20, 2024

@rustbot ready

#124560 which includes libc side change has been merged.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels May 20, 2024
@riking
Copy link

riking commented May 20, 2024

You still need to remove the Github draft status 🙂

@taiki-e taiki-e marked this pull request as ready for review May 21, 2024 01:13
@ecnelises
Copy link
Contributor

Thanks for taking care of this! I did not notice libc has been bumped.

@quadruple-output
Copy link

It might be obvious, but I would like to note that there is an inconsistency, resulting in syntax errors on AIX while the libc side (#124560) has already been merged, but this PR is still open.
Type conflicts can arise where core::ffi meets libc. This is the case at least for crates nix and rustix. The following sequence of commands results in compile errors when executed in an empty directory:

cargo init
cargo add rustix
cargo check

(tested with rustix-0.38.34 on AIX)

  --> ~/.cargo/registry/src/index.crates.io-d11c229612889eed/rustix-0.38.34/src/backend/libc/conv.rs:16:5
   |
15 | pub(super) fn c_str(c: &CStr) -> *const c::c_char {
   |                                  ---------------- expected `*const u8` because of return type
16 |     c.as_ptr()
   |     ^^^^^^^^^^ expected `*const u8`, found `*const i8`
   |
   = note: expected raw pointer `*const u8`
              found raw pointer `*const i8`

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 25, 2024

📌 Commit c31ec4f has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 25, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request May 25, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#121377 (Stabilize `LazyCell` and `LazyLock`)
 - rust-lang#122986 (Fix c_char on AIX)
 - rust-lang#123803 (Fix `VecDeque::shrink_to` UB when `handle_alloc_error` unwinds.)
 - rust-lang#124080 (Some unstable changes to where opaque types get defined)
 - rust-lang#124667 (Stabilize `div_duration`)
 - rust-lang#125472 (tidy: validate LLVM component names in tests)
 - rust-lang#125523 (Exit the process a short time after entering our ctrl-c handler)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2a1b632 into rust-lang:master May 26, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 26, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 26, 2024
Rollup merge of rust-lang#122986 - taiki-e:aix-c-char, r=Mark-Simulacrum

Fix c_char on AIX

Closes rust-lang#122985
@taiki-e taiki-e deleted the aix-c-char branch May 26, 2024 02:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

c_char on AIX should be u8