diff options
| author | bors <bors@rust-lang.org> | 2023-08-25 03:30:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-25 03:30:23 +0000 |
| commit | c9228aeaba61f57d425593f4cbbc26e4a6750a9d (patch) | |
| tree | 38ee55c4d07de28ea5fe9b93f67f90340f46e349 /library/std/src | |
| parent | c75b6bdb3751630f73d4d241338d2570a83dc3bd (diff) | |
| parent | eee76d955502b65d243551a4904aa2db531bba78 (diff) | |
Auto merge of #115193 - weihanglo:rollup-6s3mz06, r=weihanglo
Rollup of 9 pull requests Successful merges: - #114987 (elaborate a bit on the (lack of) safety in 'Mmap::map') - #115084 (Add smir `predicates_of`) - #115117 (Detect and report nix shell) - #115124 (kmc-solid: Import `std::sync::PoisonError` in `std::sys::solid::os`) - #115152 (refactor(lint): translate `RenamedOrRemovedLint`) - #115154 (Move some ui tests to subdirectories) - #115167 (Fix ub-int-array test for big-endian platforms) - #115172 (Add more tests for if_let_guard) - #115177 (Add symbols for Clippy usage) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -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; |
