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 redox_syscall #88052

Merged
merged 1 commit into from
Aug 17, 2021
Merged

Update redox_syscall #88052

merged 1 commit into from
Aug 17, 2021

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Aug 15, 2021

The currently pinned version doesn't compile with the latest rustc nightly

cc @jackpot51

The currently pinned version doesn't compile with the latest rustc nightly
@bjorn3 bjorn3 added the O-redox Operating system: Redox, https://www.redox-os.org/ label Aug 15, 2021
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 15, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 15, 2021

📌 Commit 856dd71 has been approved by Mark-Simulacrum

@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 Aug 15, 2021
camsteffen added a commit to camsteffen/rust that referenced this pull request Aug 15, 2021
…-Simulacrum

Update redox_syscall

The currently pinned version doesn't compile with the latest rustc nightly

cc `@jackpot51`
@bors
Copy link
Contributor

bors commented Aug 16, 2021

☔ The latest upstream changes (presumably #87696) 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 Aug 16, 2021
@bjorn3
Copy link
Member Author

bjorn3 commented Aug 16, 2021

That PR doesn't change Cargo.lock and github doesn't say this PR has merge conflicts.

m-ou-se added a commit to m-ou-se/rust that referenced this pull request Aug 16, 2021
…-Simulacrum

Update redox_syscall

The currently pinned version doesn't compile with the latest rustc nightly

cc `@jackpot51`
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 16, 2021
Rollup of 10 pull requests

Successful merges:

 - rust-lang#87178 ([rustdoc] Copy only item path to clipboard rather than full `use` statement.)
 - rust-lang#87677 (Adding explicit notice of lack of documentation for Tier 2 Platforms)
 - rust-lang#87958 (Closure migration multispan suggestions)
 - rust-lang#87967 (Detect fake spans in non_fmt_panic lint.)
 - rust-lang#88011 (Enable `--all-targets` for `x.py check` unconditionally)
 - rust-lang#88030 (Assign FIXMEs to me and remove obsolete ones)
 - rust-lang#88052 (Update redox_syscall)
 - rust-lang#88055 (Update RELEASES.md for 1.55.0)
 - rust-lang#88080 (Skip assert ICE with default_method_body_is_const)
 - rust-lang#88089 (Rustdoc font test)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 280ac7f into rust-lang:master Aug 17, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 17, 2021
@bjorn3 bjorn3 deleted the update_redox_syscall branch August 17, 2021 06:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-redox Operating system: Redox, https://www.redox-os.org/ S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants