Skip to content

Commit e7abce3

Browse files
authored
Unrolled build for #146800
Rollup merge of #146800 - thaliaarchi:fix-move-pal-thread, r=joboet Fix unsupported `std::sys::thread` after move 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 #145177 (std: move thread into sys). Also fix the `std` build for xtensa, which I incidentally found while looking for an unsupported platform. r? ``@joboet``
2 parents 9f2ef0f + db4d4ef commit e7abce3

File tree

6 files changed

+3
-8
lines changed

6 files changed

+3
-8
lines changed

library/core/src/ffi/va_list.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//!
33
//! Better known as "varargs".
44
5+
#[cfg(not(target_arch = "xtensa"))]
56
use crate::ffi::c_void;
67
#[allow(unused_imports)]
78
use crate::fmt;

library/std/src/sys/env_consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
// Replaces the #[else] gate with #[cfg(not(any(…)))] of all the other gates.
44
// This ensures that they must be mutually exclusive and do not have precedence
5-
// like cfg_if!.
5+
// like cfg_select!.
66
macro cfg_unordered(
77
$(#[cfg($cfg:meta)] $os:item)*
88
#[else] $fallback:item

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)