-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
Vxworks / Unix deduplication #77666
Vxworks / Unix deduplication #77666
Conversation
r? @dtolnay (rust_highfive has picked a reviewer for you, use r? to override) |
5728f6d
to
df56704
Compare
Cc @BaoshanPang |
This is nice, however there is no CI for Vxworks (tier 3). |
Yup, I noticed. Keeping an oudated copy of |
☔ The latest upstream changes (presumably #77674) made this pull request unmergeable. Please resolve the merge conflicts. Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:
|
618340e
to
7592d97
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Accepting without particular scrutiny beyond confirming that every thing changed in the PR is gated with target_os = "vxworks"
.
@bors r+ |
📌 Commit 7592d97c1213273b80337324049082cd3c9315ca has been approved by |
☔ The latest upstream changes (presumably #78001) made this pull request unmergeable. Please resolve the merge conflicts. Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:
|
7592d97
to
0f0257b
Compare
@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author |
@bors r+ |
📌 Commit 0f0257b has been approved by |
☀️ Test successful - checks-actions, checks-azure |
Move `sys::vxworks` code to `sys::unix` Follow-up to rust-lang#77666, `sys::vxworks` is almost identical to `sys::unix`, the only differences are the `rand`, `thread_local_dtor`, and `process` implementation. Since `vxworks` is `target_family = unix` anyway, there is no reason for the code not to live inside of `sys::unix` like all the other unix-OSes. https://github.com/rust-lang/rust/blob/e41f378f825488a537b024fc3ed599d9c12fda96/compiler/rustc_target/src/spec/vxworks_base.rs#L12 `@rustbot` label: +T-libs-impl
Move `sys::vxworks` code to `sys::unix` Follow-up to rust-lang#77666, `sys::vxworks` is almost identical to `sys::unix`, the only differences are the `rand`, `thread_local_dtor`, and `process` implementation. Since `vxworks` is `target_family = unix` anyway, there is no reason for the code not to live inside of `sys::unix` like all the other unix-OSes. https://github.com/rust-lang/rust/blob/e41f378f825488a537b024fc3ed599d9c12fda96/compiler/rustc_target/src/spec/vxworks_base.rs#L12 ``@rustbot`` label: +T-libs-impl
sys/vxworks
was almost entirely an (outdated) copy ofsys/unix
. I went through every file to check the differences and tried to figure out if they were simply outdated or intentional differences betweenunix
andvxworks
. Most of them did not have anyvxworks
-specific changes, so are deleted. I've added some minorcfg(target_os = "vxworks")
-specific things tosys/unix
to allow for deduplication.Before this change, the vxworks target didn't compile because its outdated process implementation did not match the expected interface anymore. This also fixes that:
std
compiles again forx86_64-wrs-vxworks
.It's probably good to merge
sys/vxworks
entirely intosys/unix
, but it might be better to to that in a follow-up PR.@rustbot modify labels: +T-libs +C-cleanup