diff options
| author | bors <bors@rust-lang.org> | 2024-09-25 02:06:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-25 02:06:55 +0000 |
| commit | 1b5aa96d6016bafe50e071b45d4d2e3c90fd766f (patch) | |
| tree | 4a859a69ea03e9d2cb552fe9bb29ae67059486a9 /library/std/src/sys/pal/unix/mod.rs | |
| parent | 3f99982c633dbca746140db60ed52ba7fa112803 (diff) | |
| parent | 9737f923e2de6e66a692a4c260ed5313ff399386 (diff) | |
| download | rust-1b5aa96d6016bafe50e071b45d4d2e3c90fd766f.tar.gz rust-1b5aa96d6016bafe50e071b45d4d2e3c90fd766f.zip | |
Auto merge of #130807 - tgross35:rollup-p304vzf, r=tgross35
Rollup of 7 pull requests Successful merges: - #130234 (improve compile errors for invalid ptr-to-ptr casts with trait objects) - #130752 (Improve assembly test for CMSE ABIs) - #130764 (Separate collection of crate-local inherent impls from error tracking) - #130788 (Pin memchr to 2.5.0 in the library rather than rustc_ast) - #130789 (add InProgress ErrorKind gated behind io_error_inprogress feature) - #130793 (Mention `COMPILETEST_VERBOSE_CRASHES` on crash test failure) - #130798 (rustdoc: inherit parent's stability where applicable) Failed merges: - #130735 (Simple validation for unsize coercion in MIR validation) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/pal/unix/mod.rs')
| -rw-r--r-- | library/std/src/sys/pal/unix/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/pal/unix/mod.rs b/library/std/src/sys/pal/unix/mod.rs index 1c9159e5fba..0d63b1119d5 100644 --- a/library/std/src/sys/pal/unix/mod.rs +++ b/library/std/src/sys/pal/unix/mod.rs @@ -279,6 +279,7 @@ pub fn decode_error_kind(errno: i32) -> ErrorKind { libc::ETIMEDOUT => TimedOut, libc::ETXTBSY => ExecutableFileBusy, libc::EXDEV => CrossesDevices, + libc::EINPROGRESS => InProgress, libc::EACCES | libc::EPERM => PermissionDenied, |