Skip to content

kmc-solid: Import std::sync::PoisonError in std::sys::solid::os #115124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 25, 2023
Merged

kmc-solid: Import std::sync::PoisonError in std::sys::solid::os #115124

merged 1 commit into from
Aug 25, 2023

Conversation

kawadakk
Copy link
Contributor

Follow-up to #114968. Fixes a missing import in *-kmc-solid_* 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`
   |

@rustbot
Copy link
Collaborator

rustbot commented Aug 23, 2023

r? @cuviper

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Aug 23, 2023
@cuviper
Copy link
Member

cuviper commented Aug 23, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 23, 2023

📌 Commit 65217a7 has been approved by cuviper

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 23, 2023
@weihanglo weihanglo mentioned this pull request Aug 24, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2023
@bors
Auto merge of rust-lang#115193 - weihanglo:rollup-6s3mz06, r=weihanglo
c9228ae 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#114987 (elaborate a bit on the (lack of) safety in 'Mmap::map')
 - rust-lang#115084 (Add smir `predicates_of`)
 - rust-lang#115117 (Detect and report nix shell)
 - rust-lang#115124 (kmc-solid: Import `std::sync::PoisonError` in `std::sys::solid::os`)
 - rust-lang#115152 (refactor(lint): translate `RenamedOrRemovedLint`)
 - rust-lang#115154 (Move some ui tests to subdirectories)
 - rust-lang#115167 (Fix ub-int-array test for big-endian platforms)
 - rust-lang#115172 (Add more tests for if_let_guard)
 - rust-lang#115177 (Add symbols for Clippy usage)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 351445a into rust-lang:master Aug 25, 2023
@rustbot rustbot added this to the 1.74.0 milestone Aug 25, 2023
@kawadakk kawadakk deleted the patch/kmc-solid/import-poison-error-in-os branch March 21, 2024 02:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.74.0
Development

Successfully merging this pull request may close these issues.
4 participants
@kawadakk @rustbot @cuviper @bors