diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-07-10 15:19:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-10 15:19:33 +0200 |
| commit | a17559bff507dc5f63797e8795417c462f901efd (patch) | |
| tree | 8c6e5735409d70d2c9ce08a1d7c1cc6540f6daaa | |
| parent | 90ead986d5b025c1f74613c940fb5595430f94aa (diff) | |
| parent | 663733584561320e07623205f2c2dfcf43c375c1 (diff) | |
| download | rust-a17559bff507dc5f63797e8795417c462f901efd.tar.gz rust-a17559bff507dc5f63797e8795417c462f901efd.zip | |
Rollup merge of #143668 - biabbas:vxworks, r=Noratrieb
Fix VxWorks build errors fixes rust-lang/rust#143442 r? ``@Noratrieb``
| -rw-r--r-- | library/std/src/sys/fs/unix.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/pal/unix/thread.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/library/std/src/sys/fs/unix.rs b/library/std/src/sys/fs/unix.rs index dc278274f00..b310db2dac4 100644 --- a/library/std/src/sys/fs/unix.rs +++ b/library/std/src/sys/fs/unix.rs @@ -1491,7 +1491,6 @@ impl File { target_os = "redox", target_os = "espidf", target_os = "horizon", - target_os = "vxworks", target_os = "nuttx", )))] let to_timespec = |time: Option<SystemTime>| match time { diff --git a/library/std/src/sys/pal/unix/thread.rs b/library/std/src/sys/pal/unix/thread.rs index 53f0d1eeda5..e4f5520d8a3 100644 --- a/library/std/src/sys/pal/unix/thread.rs +++ b/library/std/src/sys/pal/unix/thread.rs @@ -222,7 +222,7 @@ impl Thread { #[cfg(target_os = "vxworks")] pub fn set_name(name: &CStr) { - let mut name = truncate_cstr::<{ libc::VX_TASK_RENAME_LENGTH - 1 }>(name); + let mut name = truncate_cstr::<{ (libc::VX_TASK_RENAME_LENGTH - 1) as usize }>(name); let res = unsafe { libc::taskNameSet(libc::taskIdSelf(), name.as_mut_ptr()) }; debug_assert_eq!(res, libc::OK); } |