diff options
| author | bors <bors@rust-lang.org> | 2022-09-22 15:18:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-22 15:18:35 +0000 |
| commit | 89e4e1f1b32e2a88cf696337f77e10273142c1a0 (patch) | |
| tree | 0ff27603efa5eb928260cbd699d1da6d520fd7cb /library/std/src | |
| parent | 8ab71ab59fd17a1c51d23b68eced935b92431b70 (diff) | |
| parent | 33b7ff128fcae9fd06beef64926ce59e47b10229 (diff) | |
| download | rust-89e4e1f1b32e2a88cf696337f77e10273142c1a0.tar.gz rust-89e4e1f1b32e2a88cf696337f77e10273142c1a0.zip | |
Auto merge of #102139 - Dylan-DPC:rollup-ljlipt8, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #101598 (Update rustc's information on Android's sanitizers) - #102036 (Remove use of `io::ErrorKind::Other` in std) - #102037 (Make cycle errors recoverable) - #102069 (Skip `Equate` relation in `handle_opaque_type`) - #102076 (rustc_transmute: fix big-endian discriminants) - #102107 (Add missing space between notable trait tooltip and where clause) - #102119 (Fix a typo “pararmeter” in error message) - #102131 (Added which number is computed in compute_float.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/unix/process/process_unix.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/unix/process/process_unix.rs b/library/std/src/sys/unix/process/process_unix.rs index 26ae6281771..2ff8e600f7c 100644 --- a/library/std/src/sys/unix/process/process_unix.rs +++ b/library/std/src/sys/unix/process/process_unix.rs @@ -822,14 +822,14 @@ impl crate::os::linux::process::ChildExt for crate::process::Child { self.handle .pidfd .as_ref() - .ok_or_else(|| Error::new(ErrorKind::Other, "No pidfd was created.")) + .ok_or_else(|| Error::new(ErrorKind::Uncategorized, "No pidfd was created.")) } fn take_pidfd(&mut self) -> io::Result<PidFd> { self.handle .pidfd .take() - .ok_or_else(|| Error::new(ErrorKind::Other, "No pidfd was created.")) + .ok_or_else(|| Error::new(ErrorKind::Uncategorized, "No pidfd was created.")) } } |
