diff options
| author | Thalia Archibald <thalia@archibald.dev> | 2025-09-19 18:13:21 -0600 |
|---|---|---|
| committer | Thalia Archibald <thalia@archibald.dev> | 2025-09-19 19:18:10 -0600 |
| commit | 6a5838105d8496b9db5dc61b0bd12dda70f7bbe1 (patch) | |
| tree | a444f9c14fa029b576ff5b7a920f6472adc20a92 | |
| parent | ec38671075266e9cee0348701da2e133379e7c6c (diff) | |
| download | rust-6a5838105d8496b9db5dc61b0bd12dda70f7bbe1.tar.gz rust-6a5838105d8496b9db5dc61b0bd12dda70f7bbe1.zip | |
Fix unsupported std::sys::thread
Fixes building std for any platform with an unsupported thread
abstraction. This includes {aarch64,armv7,x86_64}-unknown-trusty and
riscv32im-risc0-zkvm-elf, which explicitly include the unsupported
module, and platforms with no PAL.
Bug fix for PR 145177 (std: move thread into sys).
| -rw-r--r-- | library/std/src/sys/pal/trusty/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/pal/unsupported/mod.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/pal/zkvm/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/process/unix/vxworks.rs | 3 |
4 files changed, 1 insertions, 7 deletions
diff --git a/library/std/src/sys/pal/trusty/mod.rs b/library/std/src/sys/pal/trusty/mod.rs index 275f6062463..cf0c098f8a2 100644 --- a/library/std/src/sys/pal/trusty/mod.rs +++ b/library/std/src/sys/pal/trusty/mod.rs @@ -7,8 +7,6 @@ mod common; pub mod os; #[path = "../unsupported/pipe.rs"] pub mod pipe; -#[path = "../unsupported/thread.rs"] -pub mod thread; #[path = "../unsupported/time.rs"] pub mod time; diff --git a/library/std/src/sys/pal/unsupported/mod.rs b/library/std/src/sys/pal/unsupported/mod.rs index 5e3295b1331..e64bbc7c616 100644 --- a/library/std/src/sys/pal/unsupported/mod.rs +++ b/library/std/src/sys/pal/unsupported/mod.rs @@ -2,7 +2,6 @@ pub mod os; pub mod pipe; -pub mod thread; pub mod time; mod common; diff --git a/library/std/src/sys/pal/zkvm/mod.rs b/library/std/src/sys/pal/zkvm/mod.rs index e1efa240685..9069c8d12fa 100644 --- a/library/std/src/sys/pal/zkvm/mod.rs +++ b/library/std/src/sys/pal/zkvm/mod.rs @@ -14,8 +14,6 @@ pub mod abi; pub mod os; #[path = "../unsupported/pipe.rs"] pub mod pipe; -#[path = "../unsupported/thread.rs"] -pub mod thread; #[path = "../unsupported/time.rs"] pub mod time; diff --git a/library/std/src/sys/process/unix/vxworks.rs b/library/std/src/sys/process/unix/vxworks.rs index 2275cbb946a..b9298f5fa44 100644 --- a/library/std/src/sys/process/unix/vxworks.rs +++ b/library/std/src/sys/process/unix/vxworks.rs @@ -4,8 +4,7 @@ use libc::{self, RTP_ID, c_char, c_int}; use super::common::*; use crate::io::{self, ErrorKind}; use crate::num::NonZero; -use crate::sys::cvt; -use crate::sys::pal::thread; +use crate::sys::{cvt, thread}; use crate::{fmt, sys}; //////////////////////////////////////////////////////////////////////////////// |