Skip to content

Commit

Permalink
Rollup merge of rust-lang#115124 - solid-rs:patch/kmc-solid/import-po…
Browse files Browse the repository at this point in the history
…ison-error-in-os, r=cuviper

kmc-solid: Import `std::sync::PoisonError` in `std::sys::solid::os`

Follow-up to rust-lang#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`
   |
```
  • Loading branch information
weihanglo authored Aug 24, 2023
2 parents 4369e24 + 65217a7 commit 351445a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion library/std/src/sys/solid/os.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 351445a

Please sign in to comment.