Skip to content

Commit

Permalink
Raise the MSRV to 1.56.1 in anticipation of the next release
Browse files Browse the repository at this point in the history
And fix some documentation lints warned about by the newer rustdoc.
  • Loading branch information
asomers committed Aug 14, 2022
1 parent dde5f86 commit 2cba3af
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 27 deletions.
28 changes: 6 additions & 22 deletions .cirrus.yml
Expand Up @@ -9,7 +9,7 @@ env:
RUSTDOCFLAGS: -D warnings
TOOL: cargo
# The MSRV
TOOLCHAIN: 1.46.0
TOOLCHAIN: 1.56.1
ZFLAGS:

# Tests that don't require executing the build binaries
Expand Down Expand Up @@ -94,9 +94,6 @@ task:
PATH: $HOME/.cargo/bin:$PATH
RUSTFLAGS: --cfg qemu -D warnings
TOOL: cross
# Cross needs at least 1.51.0 after Serde accidentally raised its MSRV.
# And Clippy has too many false positives from 1.51.0 through 1.53.0
TOOLCHAIN: 1.54.0
matrix:
- name: Linux arm gnueabi
env:
Expand Down Expand Up @@ -146,18 +143,18 @@ task:
matrix:
- name: Linux aarch64
arm_container:
image: rust:1.46
image: rust:1.56
env:
RUSTFLAGS: --cfg graviton -D warnings
TARGET: aarch64-unknown-linux-gnu
- name: Linux x86_64
container:
image: rust:1.46
image: rust:1.56
env:
TARGET: x86_64-unknown-linux-gnu
- name: Linux x86_64 musl
container:
image: rust:1.46
image: rust:1.56
env:
TARGET: x86_64-unknown-linux-musl
setup_script:
Expand All @@ -183,7 +180,7 @@ task:
# Tasks for cross-compiling, but no testing
task:
container:
image: rust:1.46
image: rust:1.56
env:
BUILD: check
HOST: x86_64-unknown-linux-gnu
Expand Down Expand Up @@ -214,27 +211,18 @@ task:
- name: Illumos
env:
TARGET: x86_64-unknown-illumos
# illumos toolchain isn't available via rustup until 1.50
TOOLCHAIN: 1.50.0
container:
image: rust:1.50
# Cross claims to support running tests on iOS, but it actually doesn't.
# https://github.com/rust-embedded/cross/issues/535
- name: iOS aarch64
env:
# cargo hack tries to invoke the iphonesimulator SDK for iOS
NOHACK: 1
TARGET: aarch64-apple-ios
# Rustup only supports cross-building from arbitrary hosts for iOS at
# 1.49.0 and above. Below that it's possible to cross-build from a macOS
# host, but macOS VMs are more expensive than Linux VMs.
TOOLCHAIN: 1.49.0
- name: iOS x86_64
env:
# cargo hack tries to invoke the iphonesimulator SDK for iOS
NOHACK: 1
TARGET: x86_64-apple-ios
TOOLCHAIN: 1.49.0
# Cross testing on powerpc fails with "undefined reference to renameat2".
# Perhaps cross is using too-old a version?
- name: Linux powerpc
Expand All @@ -254,10 +242,6 @@ task:
- name: macOS aarch64
env:
TARGET: aarch64-apple-darwin
# macOS aarch64 toolchain isn't available via rustup until 1.49
TOOLCHAIN: 1.49.0
container:
image: rust:1.49
- name: NetBSD x86_64
env:
TARGET: x86_64-unknown-netbsd
Expand All @@ -271,7 +255,7 @@ task:

task:
container:
image: rust:1.46
image: rust:1.56
env:
BUILD: check
name: Redox x86_64
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -8,6 +8,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).

### Changed

- The MSRV is now 1.56.1
([#1792](https://github.com/nix-rust/nix/pull/1792))

### Fixed

### Removed
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -3,7 +3,7 @@ name = "nix"
description = "Rust friendly bindings to *nix APIs"
edition = "2018"
version = "0.25.0"
rust-version = "1.46"
rust-version = "1.56"
authors = ["The nix-rust Project Developers"]
repository = "https://github.com/nix-rust/nix"
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -89,7 +89,7 @@ Tier 3:

## Minimum Supported Rust Version (MSRV)

nix is supported on Rust 1.46.0 and higher. Its MSRV will not be
nix is supported on Rust 1.56.1 and higher. Its MSRV will not be
changed in the future without bumping the major or minor version.

## Contributing
Expand Down
5 changes: 3 additions & 2 deletions src/sys/signal.rs
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sys/socket/addr.rs
Expand Up @@ -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);
Expand Down

0 comments on commit 2cba3af

Please sign in to comment.