diff options
| author | bors <bors@rust-lang.org> | 2022-06-26 19:02:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-26 19:02:00 +0000 |
| commit | c80c4b8fdcf3da69cd483e2fec172c9b1f95842c (patch) | |
| tree | d80e4c65e8e9264599d1145fcbfa1c3419d9c3df /library/std/src/sys/solid/mod.rs | |
| parent | 788ddedb0d88e40db9cd62b6163d5a471813044b (diff) | |
| parent | 935958e6e434f2a60a774fface59492275a87996 (diff) | |
| download | rust-c80c4b8fdcf3da69cd483e2fec172c9b1f95842c.tar.gz rust-c80c4b8fdcf3da69cd483e2fec172c9b1f95842c.zip | |
Auto merge of #98545 - matthiaskrgr:rollup-njely29, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - #97140 (std: use an event-flag-based thread parker on SOLID) - #97295 ([rustc_parse] Forbid `let`s in certain places) - #97743 (make const_err show up in future breakage reports) - #97908 (Stabilize NonZero* checked operations constness.) - #98297 (Transform help popup into a pocket menu) - #98428 (macros: use typed identifiers in diag and subdiag derive) - #98528 (Respect --color when building rustbuild itself) - #98535 (Add regression test for generic const in rustdoc) - #98538 (Add a ui test for issue #91883) - #98540 (Add regression test for #87558) - #98541 (Update `std::alloc::System` doc example code style) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/solid/mod.rs')
| -rw-r--r-- | library/std/src/sys/solid/mod.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/sys/solid/mod.rs b/library/std/src/sys/solid/mod.rs index 5ffa381f2e5..2d21e4764fc 100644 --- a/library/std/src/sys/solid/mod.rs +++ b/library/std/src/sys/solid/mod.rs @@ -15,6 +15,7 @@ mod itron { pub mod thread; pub(super) mod time; use super::unsupported; + pub mod wait_flag; } pub mod alloc; @@ -43,6 +44,7 @@ pub mod memchr; pub mod thread_local_dtor; pub mod thread_local_key; pub mod time; +pub use self::itron::wait_flag; mod rwlock; |