Skip to content

Rollup of 7 pull requests #83119

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.

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

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b03dba6
Add Linux-specific pidfd process extensions
Aaron1011 Sep 16, 2020
2e20fe3
Typo fix
joshtriplett Oct 18, 2020
ed86f6e
Add PidFd type and seal traits
voidc Feb 6, 2021
f23b30c
Add tracking issue and link to man-page
voidc Mar 10, 2021
1ba71ab
Inline Attribute::has_name
tmiasko Mar 11, 2021
4943190
Validate rustc_layout_scalar_valid_range_{start,end} attributes
tmiasko Mar 11, 2021
0466b6a
Improve the wording for the `can't reassign` error
JohnTitor Mar 12, 2021
c74fdf0
More precise spans for HIR paths
petrochenkov Mar 13, 2021
71a784d
Fix a typo in `swap_nonoverlapping_bytes`
hiyoko3m Mar 12, 2021
5ec0540
Fix a typo in thread_local_dtor.rs
hiyoko3m Mar 14, 2021
6ddd840
Minor refactoring in try_index_step
osa1 Mar 14, 2021
14038c7
Remove duplicate asserts, replace eq assert with assert_eq
osa1 Mar 14, 2021
a4cc3ca
expand: Resolve and expand inner attributes on out-of-line modules
petrochenkov Feb 21, 2021
ca4cdc2
Rollup merge of #81825 - voidc:pidfd, r=joshtriplett
Dylan-DPC Mar 14, 2021
377542a
Rollup merge of #82399 - petrochenkov:modin2, r=Aaron1011
Dylan-DPC Mar 14, 2021
68422d2
Rollup merge of #83054 - tmiasko:rustc_layout_scalar_valid_range, r=d…
Dylan-DPC Mar 14, 2021
5f27f0e
Rollup merge of #83062 - JohnTitor:improve-reassign-err, r=davidtwco
Dylan-DPC Mar 14, 2021
f540402
Rollup merge of #83092 - petrochenkov:qspan, r=estebank
Dylan-DPC Mar 14, 2021
a084fbb
Rollup merge of #83110 - hyksm:fix-typo, r=jonas-schievink
Dylan-DPC Mar 14, 2021
eb3e358
Rollup merge of #83113 - osa1:refactor_try_index_step, r=jonas-schievink
Dylan-DPC Mar 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add tracking issue and link to man-page
  • Loading branch information
voidc committed Mar 10, 2021
commit f23b30c66c01865aff90f1bb7ec4deb5cb77f818
5 changes: 3 additions & 2 deletions library/std/src/os/linux/process.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Linux-specific extensions to primitives in the `std::process` module.

#![unstable(feature = "linux_pidfd", issue = "none")]
#![unstable(feature = "linux_pidfd", issue = "82971")]

use crate::io::Result;
use crate::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
Expand Down Expand Up @@ -31,13 +31,14 @@ use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
///
/// // The file descriptor will be closed when `pidfd` is dropped.
/// ```
/// Refer to the man page of `pidfd_open(2)` for further details.
/// Refer to the man page of [`pidfd_open(2)`] for further details.
///
/// [`Command`]: process::Command
/// [`create_pidfd`]: CommandExt::create_pidfd
/// [`Child`]: process::Child
/// [`pidfd`]: fn@ChildExt::pidfd
/// [`take_pidfd`]: ChildExt::take_pidfd
/// [`pidfd_open(2)`]: https://man7.org/linux/man-pages/man2/pidfd_open.2.html
#[derive(Debug)]
pub struct PidFd {
inner: FileDesc,
Expand Down
2 changes: 1 addition & 1 deletion library/std/src/sys/unix/process/process_unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ impl fmt::Display for ExitStatus {
}

#[cfg(target_os = "linux")]
#[unstable(feature = "linux_pidfd", issue = "none")]
#[unstable(feature = "linux_pidfd", issue = "82971")]
impl crate::os::linux::process::ChildExt for crate::process::Child {
fn pidfd(&self) -> io::Result<&PidFd> {
self.handle
Expand Down