diff options
| author | Weihang Lo <weihanglo@users.noreply.github.com> | 2023-08-24 22:53:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-24 22:53:58 +0100 |
| commit | 351445ad4422e95e8569562bd34d9c5477236edc (patch) | |
| tree | 5103478e8853db1415f66ace0b44cab64e9da72a /library/std/src/sys | |
| parent | 4369e24875e66f43bca7aa71f110b9a0973df50f (diff) | |
| parent | 65217a72b08b21ae252794d0363796092e2219d7 (diff) | |
| download | rust-351445ad4422e95e8569562bd34d9c5477236edc.tar.gz rust-351445ad4422e95e8569562bd34d9c5477236edc.zip | |
Rollup merge of #115124 - solid-rs:patch/kmc-solid/import-poison-error-in-os, r=cuviper
kmc-solid: Import `std::sync::PoisonError` in `std::sys::solid::os` Follow-up to #114968. Fixes a missing import in [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) Tier 3 targets. ``` error[E0433]: failed to resolve: use of undeclared type `PoisonError` C:\Users\xxxxx\.rustup\toolchains\nightly-2023-08-23-x86_64-pc-windows-gnu\lib\rustlib\src\rust\library\std\src\sys\solid\os.rs(85,36) | 85 | ENV_LOCK.read().unwrap_or_else(PoisonError::into_inner) | ^^^^^^^^^^^ use of undeclared type `PoisonError` | ```
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/solid/os.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/solid/os.rs b/library/std/src/sys/solid/os.rs index 9f4e66d628b..ff81544ba91 100644 --- a/library/std/src/sys/solid/os.rs +++ b/library/std/src/sys/solid/os.rs @@ -8,7 +8,7 @@ use crate::os::{ solid::ffi::{OsStrExt, OsStringExt}, }; use crate::path::{self, PathBuf}; -use crate::sync::RwLock; +use crate::sync::{PoisonError, RwLock}; use crate::sys::common::small_c_string::run_with_cstr; use crate::vec; |