Skip to content

Commit 24ca957

Browse files
thaliaarchiMuscraft
authored andcommitted
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).
1 parent ef1d0da commit 24ca957

File tree

4 files changed

+1
-7
lines changed

4 files changed

+1
-7
lines changed

library/std/src/sys/pal/trusty/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ mod common;
77
pub mod os;
88
#[path = "../unsupported/pipe.rs"]
99
pub mod pipe;
10-
#[path = "../unsupported/thread.rs"]
11-
pub mod thread;
1210
#[path = "../unsupported/time.rs"]
1311
pub mod time;
1412

library/std/src/sys/pal/unsupported/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
pub mod os;
44
pub mod pipe;
5-
pub mod thread;
65
pub mod time;
76

87
mod common;

library/std/src/sys/pal/zkvm/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ pub mod abi;
1414
pub mod os;
1515
#[path = "../unsupported/pipe.rs"]
1616
pub mod pipe;
17-
#[path = "../unsupported/thread.rs"]
18-
pub mod thread;
1917
#[path = "../unsupported/time.rs"]
2018
pub mod time;
2119

library/std/src/sys/process/unix/vxworks.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ use libc::{self, RTP_ID, c_char, c_int};
44
use super::common::*;
55
use crate::io::{self, ErrorKind};
66
use crate::num::NonZero;
7-
use crate::sys::cvt;
8-
use crate::sys::pal::thread;
7+
use crate::sys::{cvt, thread};
98
use crate::{fmt, sys};
109

1110
////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)