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

Update rustix to 0.36.5 #105511

Merged
merged 1 commit into from
Dec 11, 2022
Merged

Update rustix to 0.36.5 #105511

merged 1 commit into from
Dec 11, 2022

Conversation

luqmana
Copy link
Member

@luqmana luqmana commented Dec 9, 2022

Pull in fix for bytecodealliance/rustix#467 on recent cargo nightlies.

Pull in fix for bytecodealliance/rustix#467 on
recent cargo nightlies.
@rustbot
Copy link
Collaborator

rustbot commented Dec 9, 2022

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 9, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 10, 2022

📌 Commit ffe740f 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 Dec 10, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 10, 2022
…ulacrum

Update rustix to 0.36.5

Pull in fix for bytecodealliance/rustix#467 on recent cargo nightlies.
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2022
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#103146 (Cleanup timeouts in pthread condvar)
 - rust-lang#105459 (Build rust-analyzer proc-macro server by default)
 - rust-lang#105460 (Bump compiler-builtins to 0.1.85)
 - rust-lang#105511 (Update rustix to 0.36.5)
 - rust-lang#105530 (Clean up lifetimes in rustdoc syntax highlighting)
 - rust-lang#105534 (Add Nilstrieb to compiler reviewers)
 - rust-lang#105542 (Some method confirmation code nits)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 97aa7cb into rust-lang:master Dec 11, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 11, 2022
@bors
Copy link
Contributor

bors commented Dec 11, 2022

☔ The latest upstream changes (presumably #105543) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 11, 2022
@luqmana luqmana deleted the rustix-upgrade branch December 11, 2022 06:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants