diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-08-16 00:55:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-16 00:55:36 +0000 |
| commit | 2a8b438860ed37d515ed2cf854a9cd7cfaef35d5 (patch) | |
| tree | e200b2ad29f8b62163895c0ea1dd26620140718b /src | |
| parent | dde5f86f41dcaa9822a7ac623afb126352a48bf6 (diff) | |
| parent | c6371db662a0b647dc9e45258393017cf27bd6c2 (diff) | |
| download | nix-2a8b438860ed37d515ed2cf854a9cd7cfaef35d5.zip | |
Merge #1792
1792: Raise the MSRV to 1.56.1 r=rtzoeller a=asomers
Nix's code hasn't changed. However, Serde accidentally raised its MSRV
to 1.51.0 in a patch release, due to a Cargo bug. They don't plan to
change it back. Nix does not depend on Serde, but it's used by
cargo-hack, which we build as part of our CI process. So we need to
either raise our MSRV, or else install a separate toolchain during CI
just to build cargo-hack.
https://github.com/serde-rs/serde/issues/2255
Co-authored-by: Alan Somers <asomers@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sys/signal.rs | 5 | ||||
| -rw-r--r-- | src/sys/socket/addr.rs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/sys/signal.rs b/src/sys/signal.rs index 0da9c74a..cd3e87ec 100644 --- a/src/sys/signal.rs +++ b/src/sys/signal.rs @@ -911,10 +911,11 @@ pub fn sigprocmask(how: SigmaskHow, set: Option<&SigSet>, oldset: Option<&mut Si /// # Arguments /// /// * `pid` - Specifies which processes should receive the signal. -/// - If positive, specifies an individual process +/// - If positive, specifies an individual process. /// - If zero, the signal will be sent to all processes whose group /// ID is equal to the process group ID of the sender. This is a -/// variant of [`killpg`]. +#[cfg_attr(target_os = "fuchsia", doc = "variant of `killpg`.")] +#[cfg_attr(not(target_os = "fuchsia"), doc = "variant of [`killpg`].")] /// - If `-1` and the process has super-user privileges, the signal /// is sent to all processes exclusing system processes. /// - If less than `-1`, the signal is sent to all processes whose diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs index ad917cd0..6b2ba21c 100644 --- a/src/sys/socket/addr.rs +++ b/src/sys/socket/addr.rs @@ -2244,7 +2244,7 @@ pub mod sys_control { /// /// # References /// - /// https://developer.apple.com/documentation/kernel/sockaddr_ctl + /// <https://developer.apple.com/documentation/kernel/sockaddr_ctl> #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] #[repr(transparent)] pub struct SysControlAddr(pub(in super::super) libc::sockaddr_ctl); |