Vxworks / Unix deduplication by m-ou-se · Pull Request #77666 · rust-lang/rust

m-ou-se · 2020-10-07T19:09:02Z

sys/vxworks was almost entirely an (outdated) copy of sys/unix. I went through every file to check the differences and tried to figure out if they were simply outdated or intentional differences between unix and vxworks. Most of them did not have any vxworks-specific changes, so are deleted. I've added some minor cfg(target_os = "vxworks")-specific things to sys/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 for x86_64-wrs-vxworks.

It's probably good to merge sys/vxworks entirely into sys/unix, but it might be better to to that in a follow-up PR.

@rustbot modify labels: +T-libs +C-cleanup

rust-highfive · 2020-10-07T19:09:06Z

r? @dtolnay

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

m-ou-se · 2020-10-07T19:50:13Z

Cc @BaoshanPang

tesuji · 2020-10-08T14:33:37Z

This is nice, however there is no CI for Vxworks (tier 3).

m-ou-se · 2020-10-08T14:53:18Z

there is no CI for Vxworks (tier 3)

Yup, I noticed. std didn't even build for vxworks before this PR. At least it builds now.

Keeping an oudated copy of sys/unix around is pretty annoying, as changes to sys now need to be applied to two slightly different copies of sys/unix. For example, #77674, #76651, etc. (Or not, but then the problem just becomes bigger over time as it becomes more outdated.)

bors · 2020-10-09T21:30:52Z

☔ 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:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

dtolnay

Thanks!

Accepting without particular scrutiny beyond confirming that every thing changed in the PR is gated with target_os = "vxworks".

dtolnay · 2020-10-15T20:02:33Z

@bors r+

bors · 2020-10-15T20:02:35Z

📌 Commit 7592d97c1213273b80337324049082cd3c9315ca has been approved by dtolnay

bors · 2020-10-16T02:52:15Z

☔ 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:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

m-ou-se · 2020-10-16T04:23:45Z

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

dtolnay · 2020-10-16T04:32:45Z

@bors r+

bors · 2020-10-16T04:32:46Z

📌 Commit 0f0257b has been approved by dtolnay

bors · 2020-10-16T07:44:41Z

⌛ Testing commit 0f0257b with merge 95b4a4f...

bors · 2020-10-16T09:58:36Z

☀️ Test successful - checks-actions, checks-azure
Approved by: dtolnay
Pushing 95b4a4f to master...

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

rustbot added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs-api [DEPRECATED; DO NOT USE] labels Oct 7, 2020

rust-highfive assigned dtolnay Oct 7, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 7, 2020

m-ou-se force-pushed the vxworks-cleanup branch from 5728f6d to df56704Compare October 7, 2020 19:23

m-ou-se mentioned this pull request Oct 8, 2020
#![deny(unsafe_op_in_unsafe_fn)] in libstd #73904
Closed
22 tasks

m-ou-se force-pushed the vxworks-cleanup branch 2 times, most recently from 618340e to 7592d97Compare October 9, 2020 22:22

m-ou-se mentioned this pull request Oct 12, 2020
Use Pin to pin RWLock. #77865
Closed

dtolnay approved these changes Oct 15, 2020
View reviewed changes

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 Oct 15, 2020

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 Oct 16, 2020

m-ou-se added 8 commits October 16, 2020 06:18

Take sys/vxworks/mutex from sys/unix instead.
b8dcd2f

Take sys/vxworks/condvar from sys/unix instead.
f3f30c7

Take sys/vxworks/rwlock from sys/unix instead.
f875c8b

Take sys/vxworks/time from sys/unix instead.
d194762

Take sys/vxworks/stack_overflow from sys/unix instead.
c8628f4

Take sys/vxworks/thread from sys/unix instead.
5d526f6

Take sys/vxworks/stdio from sys/unix instead.
4853a6e

Take sys/vxworks/thread_local_key from sys/unix instead.
678d078

m-ou-se added 9 commits October 16, 2020 06:19

Add weak macro to vxworks.
c909ff9

Take sys/vxworks/ext/* from sys/unix instead.
a489c33

Take sys/vxworks/net from sys/unix instead.
dce405a

Take sys/vxworks/memchar from sys/unix instead.
08bcaac

Take sys/vxworks/args from sys/unix instead.
ba483c5

Take sys/vxworks/cmath from sys/unix instead.
3f196dc

Take sys/vxworks/{fd,fs,io} from sys/unix instead.
71bb1dc

Take sys/vxworks/{os,path,pipe} from sys/unix instead.
408db0d

Take some of sys/vxworks/process/* from sys/unix instead.
0f0257b

m-ou-se force-pushed the vxworks-cleanup branch from 7592d97 to 0f0257bCompare October 16, 2020 04:22

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 16, 2020

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 Oct 16, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 16, 2020

bors merged commit 95b4a4f into rust-lang:masterOct 16, 2020

rustbot added this to the 1.49.0 milestone Oct 16, 2020

bors mentioned this pull request Oct 16, 2020
[WIP] Add size-limited command interface #74549
Closed
11 tasks

CDirkx mentioned this pull request Apr 12, 2021
Move sys::vxworks code to sys::unix#84119
Merged

m-ou-se deleted the vxworks-cleanup branch April 12, 2021 14:38

matthiaskrgr mentioned this pull request Mar 18, 2024
ICE: can't find an upper bound in nll::compute_regions in rustc_borrowck #122704
Closed

matthiaskrgr mentioned this pull request Apr 4, 2024
ICE: Failed to normalize Alias(Projection, AliasTy ..#113272
Closed

workingjubilee mentioned this pull request Jun 27, 2024
std::net::TcpStream::connect_timeout on vxworks #127018
Closed

Uh oh!

Uh oh!

Conversation

m-ou-se commented Oct 7, 2020

Uh oh!

rust-highfive commented Oct 7, 2020

Uh oh!

m-ou-se commented Oct 7, 2020

Uh oh!

tesuji commented Oct 8, 2020

Uh oh!

m-ou-se commented Oct 8, 2020

Uh oh!

bors commented Oct 9, 2020

Uh oh!

dtolnay left a comment

Choose a reason for hiding this comment

Uh oh!

dtolnay commented Oct 15, 2020

Uh oh!

bors commented Oct 15, 2020

Uh oh!

bors commented Oct 16, 2020

Uh oh!

m-ou-se commented Oct 16, 2020

Uh oh!

dtolnay commented Oct 16, 2020

Uh oh!

bors commented Oct 16, 2020

Uh oh!

bors commented Oct 16, 2020

Uh oh!

bors commented Oct 16, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants