Move sys::vxworks code to sys::unix

[CDirkx]

Follow-up to #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.

rust/compiler/rustc_target/src/spec/vxworks_base.rs

Line 12 in e41f378

os_family: Some("unix".to_string()),

@rustbot label: +T-libs-impl

[rust-highfive]

r? @m-ou-se

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

[m-ou-se]

I don't have required toolchain to build vxworks on my machine, so I can't confirm this code compiles

Does this work for you? ./x.py check --target=x86_64-wrs-vxworks library/std

It gives some compiler errors:

error[E0428]: the name `imp` is defined multiple times
   --> library/std/src/sys/unix/rand.rs:242:1
    |
23  | mod imp {
    | ------- previous definition of the module `imp` here
...
242 | mod imp {
    | ^^^^^^^ `imp` redefined here
    |
    = note: `imp` must be defined only once in the type namespace of this module

error[E0433]: failed to resolve: could not find `platform` in `super`
 --> library/std/src/sys/unix/ext/fs.rs:5:12
  |
5 | use super::platform::fs::MetadataExt as _;
  |            ^^^^^^^^ could not find `platform` in `super`

error[E0433]: failed to resolve: could not find `platform` in `super`
  --> library/std/src/sys/unix/ext/raw.rs:27:16
   |
27 | pub use super::platform::raw::pthread_t;
   |                ^^^^^^^^ could not find `platform` in `super`

error[E0433]: failed to resolve: could not find `platform` in `super`
  --> library/std/src/sys/unix/ext/raw.rs:30:16
   |
30 | pub use super::platform::raw::{blkcnt_t, time_t};
   |                ^^^^^^^^ could not find `platform` in `super`

error[E0433]: failed to resolve: could not find `platform` in `super`
  --> library/std/src/sys/unix/ext/raw.rs:33:16
   |
33 | pub use super::platform::raw::{blksize_t, dev_t, ino_t, mode_t, nlink_t, off_t};
   |                ^^^^^^^^ could not find `platform` in `super`

error[E0432]: unresolved import `crate::os::unix::raw::pthread_t`
 --> library/std/src/sys/unix/ext/thread.rs:6:5
  |
6 | use crate::os::unix::raw::pthread_t;
  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `pthread_t` in `sys::unix::ext::raw`

error[E0425]: cannot find function `env_lock` in module `sys::os`
  --> library/std/src/sys/unix/process/process_vxworks.rs:71:34
   |
71 |             let _lock = sys::os::env_lock();
   |                                  ^^^^^^^^ not found in `sys::os`

error[E0599]: no method named `st_dev` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:661:14
    |
661 |         self.st_dev()
    |              ^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_ino` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:664:14
    |
664 |         self.st_ino()
    |              ^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_mode` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:667:14
    |
667 |         self.st_mode()
    |              ^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_nlink` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:670:14
    |
670 |         self.st_nlink()
    |              ^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_uid` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:673:14
    |
673 |         self.st_uid()
    |              ^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_gid` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:676:14
    |
676 |         self.st_gid()
    |              ^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_rdev` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:679:14
    |
679 |         self.st_rdev()
    |              ^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_size` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:682:14
    |
682 |         self.st_size()
    |              ^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_atime` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:685:14
    |
685 |         self.st_atime()
    |              ^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_atime_nsec` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:688:14
    |
688 |         self.st_atime_nsec()
    |              ^^^^^^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_mtime` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:691:14
    |
691 |         self.st_mtime()
    |              ^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_mtime_nsec` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:694:14
    |
694 |         self.st_mtime_nsec()
    |              ^^^^^^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_ctime` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:697:14
    |
697 |         self.st_ctime()
    |              ^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_ctime_nsec` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:700:14
    |
700 |         self.st_ctime_nsec()
    |              ^^^^^^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_blksize` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:703:14
    |
703 |         self.st_blksize()
    |              ^^^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_blocks` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:706:14
    |
706 |         self.st_blocks()
    |              ^^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `st_attrib` found for reference `&fs::Metadata` in the current scope
   --> library/std/src/sys/unix/ext/fs.rs:710:14
    |
710 |         self.st_attrib()
    |              ^^^^^^^^^ method not found in `&fs::Metadata`
    |
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use crate::os::vxworks::fs::MetadataExt;`

error[E0599]: no method named `core_dumped` found for reference `&process_inner::ExitStatus` in the current scope
   --> library/std/src/sys/unix/ext/process.rs:259:25
    |
259 |         self.as_inner().core_dumped()
    |                         ^^^^^^^^^^^ method not found in `&process_inner::ExitStatus`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `ExitStatusExt` defines an item `core_dumped`, perhaps you need to implement it
   --> library/std/src/sys/unix/ext/process.rs:210:1
    |
210 | pub trait ExitStatusExt: Sealed {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error[E0599]: no method named `stopped_signal` found for reference `&process_inner::ExitStatus` in the current scope
   --> library/std/src/sys/unix/ext/process.rs:263:25
    |
263 |         self.as_inner().stopped_signal()
    |                         ^^^^^^^^^^^^^^ method not found in `&process_inner::ExitStatus`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `ExitStatusExt` defines an item `stopped_signal`, perhaps you need to implement it
   --> library/std/src/sys/unix/ext/process.rs:210:1
    |
210 | pub trait ExitStatusExt: Sealed {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error[E0599]: no method named `continued` found for reference `&process_inner::ExitStatus` in the current scope
   --> library/std/src/sys/unix/ext/process.rs:267:25
    |
267 |         self.as_inner().continued()
    |                         ^^^^^^^^^ method not found in `&process_inner::ExitStatus`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `ExitStatusExt` defines an item `continued`, perhaps you need to implement it
   --> library/std/src/sys/unix/ext/process.rs:210:1
    |
210 | pub trait ExitStatusExt: Sealed {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error[E0599]: no method named `into_raw` found for reference `&process_inner::ExitStatus` in the current scope
   --> library/std/src/sys/unix/ext/process.rs:271:25
    |
271 |         self.as_inner().into_raw().into()
    |                         ^^^^^^^^ method not found in `&process_inner::ExitStatus`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
note: `ExitStatusExt` defines an item `into_raw`, perhaps you need to implement it
   --> library/std/src/sys/unix/ext/process.rs:210:1
    |
210 | pub trait ExitStatusExt: Sealed {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to 28 previous errors

[m-ou-se]

Oh, it looks like quite a few of those errors also exist on the main branch. Apparently std for vxworks is already broken on nightly. :(

[CDirkx]

./x.py check --target=x86_64-wrs-vxworks library/std

I tried, but that results in couldn't find required command: "wr-cc", which I assumed was a proprietary compiler vendored by Wind River.

[m-ou-se]

Ah, making wr-cc a symlink to gcc or clang 'works' (at least for ./x.py check). Apparently I already set that up on my machine last time I was moving some stuff around for this target.

[CDirkx]

making wr-cc a symlink to gcc or clang 'works'

It did :) passing CC=cc and AR=ar is enough to run check.
I fixed the issues, so now everything compiles. However, because libc::WCOREDUMP and libc::WIFCONTINUED are not available on vxworks, and I don't know what the correct implementation would be, some methods are implemented using unimplemented!

[bors]

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

[m-ou-se]

Thanks for working on this!

[m-ou-se]

It's probably better to not put this attribute here and instead put something like let _ = self.get_closures(); with a comment in the vxworks code. Then it's more explicit that the pre_exec closures are ignored on vxworks.

(Ideally we shouldn't even expose pre_exec on platforms that don't have that ability, but it's part of the unix extension trait for Command.)

[CDirkx]

Added your suggestion with a comment.

[m-ou-se]

Thanks!

@bors r+

(We should maybe try to at least run ./x.py check for vxworks in our CI, because now none of this really gets checked even for compiler errors.)

[bors]

📌 Commit aa46f08 has been approved by m-ou-se

[bors]

🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened.