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

apple add pthread_jit_write_callback_t api related. #2896

Merged
merged 1 commit into from Sep 2, 2022

Conversation

devnexen
Copy link
Contributor

@devnexen devnexen commented Sep 1, 2022

No description provided.

@rust-highfive
Copy link

r? @Amanieu

(rust-highfive has picked a reviewer for you, use r? to override)

@devnexen devnexen force-pushed the pthread_jit_mac_upd branch 3 times, most recently from 86a3a3e to 4ba4e21 Compare September 1, 2022 21:25
@JohnTitor
Copy link
Member

Looks good! @bors r+

@bors
Copy link
Contributor

bors commented Sep 2, 2022

📌 Commit 52b45a7 has been approved by JohnTitor

It is now in the queue for this repository.

bors added a commit that referenced this pull request Sep 2, 2022
apple add pthread_jit_write_callback_t api related.
@bors
Copy link
Contributor

bors commented Sep 2, 2022

⌛ Testing commit 52b45a7 with merge 564c39d...

@bors
Copy link
Contributor

bors commented Sep 2, 2022

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Sep 2, 2022

⌛ Testing commit 52b45a7 with merge b6e4704...

@bors
Copy link
Contributor

bors commented Sep 2, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing b6e4704 to master...

@bors bors merged commit b6e4704 into rust-lang:master Sep 2, 2022
bors added a commit that referenced this pull request Sep 29, 2022
Use `::Option` and not `Option` for `pthread_jit_write_callback_t`

The `pthread_jit_write_callback_t` type alias (introduced by #2896) uses `Option` rather than `::Option`, which causes problems when trying to update the `libc` dependency that `std` has.

(Please cut a release after merging this <3)
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.

None yet

5 participants