diff options
| author | bors <bors@rust-lang.org> | 2025-09-25 14:03:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-25 14:03:21 +0000 |
| commit | 6f34f4ee074ce0affc7bbf4e2c835f66cd576f13 (patch) | |
| tree | aede93bdb1c46b7be634690e6fe75c8160e124a2 /library/std/src/sys/thread/mod.rs | |
| parent | 7cfd7d328b14b936c7ffede92cacebe8557c6388 (diff) | |
| parent | 59866ef3058654a81a44e2869d6647d8ba39c0fe (diff) | |
| download | rust-6f34f4ee074ce0affc7bbf4e2c835f66cd576f13.tar.gz rust-6f34f4ee074ce0affc7bbf4e2c835f66cd576f13.zip | |
Auto merge of #147019 - Zalathar:rollup-boxzbmo, r=Zalathar
Rollup of 14 pull requests Successful merges: - rust-lang/rust#145067 (RawVecInner: add missing `unsafe` to unsafe fns) - rust-lang/rust#145277 (Do not materialise X in [X; 0] when X is unsizing a const) - rust-lang/rust#145973 (Add `std` support for `armv7a-vex-v5`) - rust-lang/rust#146667 (Add an attribute to check the number of lanes in a SIMD vector after monomorphization) - rust-lang/rust#146735 (unstably constify float mul_add methods) - rust-lang/rust#146737 (f16_f128: enable some more tests in Miri) - rust-lang/rust#146766 (Add attributes for #[global_allocator] functions) - rust-lang/rust#146905 (llvm: update remarks support on LLVM 22) - rust-lang/rust#146982 (Remove erroneous normalization step in `tests/run-make/linker-warning`) - rust-lang/rust#147005 (Small string formatting cleanup) - rust-lang/rust#147007 (Explicitly note `&[SocketAddr]` impl of `ToSocketAddrs`) - rust-lang/rust#147008 (bootstrap.py: Respect build.jobs while building bootstrap tool) - rust-lang/rust#147013 (rustdoc: Fix documentation for `--doctest-build-arg`) - rust-lang/rust#147015 (Use `LLVMDisposeTargetMachine`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/thread/mod.rs')
| -rw-r--r-- | library/std/src/sys/thread/mod.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/library/std/src/sys/thread/mod.rs b/library/std/src/sys/thread/mod.rs index 6bb7fc1a20e..3bd83dd760a 100644 --- a/library/std/src/sys/thread/mod.rs +++ b/library/std/src/sys/thread/mod.rs @@ -81,6 +81,13 @@ cfg_select! { ))] pub use unsupported::set_name; } + target_os = "vexos" => { + mod vexos; + pub use vexos::{sleep, yield_now}; + #[expect(dead_code)] + mod unsupported; + pub use unsupported::{Thread, available_parallelism, current_os_id, set_name, DEFAULT_MIN_STACK_SIZE}; + } all(target_os = "wasi", target_env = "p1") => { mod wasip1; pub use wasip1::{DEFAULT_MIN_STACK_SIZE, sleep, yield_now}; |