diff options
| author | Alan Somers <asomers@gmail.com> | 2020-12-14 19:55:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 19:55:26 -0700 |
| commit | b1b162fe1831c58243487351d933e5407b821fe7 (patch) | |
| tree | 8f3f55648b7d0d1930b270a523691f35817a7714 | |
| parent | d922c72a765640c5e190fb01129f712e6ac513df (diff) | |
| parent | d87e6b28202ce9b3e2bebd1ba93e3df1f1e9fef6 (diff) | |
| download | nix-b1b162fe1831c58243487351d933e5407b821fe7.zip | |
Merge pull request #1358 from asomers/rust_1.40.0
Raise MSRV to 1.40.0
| -rw-r--r-- | .cirrus.yml | 10 | ||||
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | test/sys/test_aio.rs | 3 | ||||
| -rw-r--r-- | test/test_unistd.rs | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 585dd24f..f3b18d6a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -12,7 +12,7 @@ task: image: freebsd-11-4-release-amd64 setup_script: - fetch https://sh.rustup.rs -o rustup.sh - - sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0 + - sh rustup.sh -y --profile=minimal --default-toolchain 1.40.0 - $HOME/.cargo/bin/rustup target add i686-unknown-freebsd amd64_test_script: - . $HOME/.cargo/env @@ -42,7 +42,7 @@ task: image: catalina-xcode setup_script: - curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs - - sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0 + - sh rustup.sh -y --profile=minimal --default-toolchain 1.40.0 - . $HOME/.cargo/env - bash ci/install.sh script: @@ -92,7 +92,7 @@ docker_builder: setup_script: - mkdir /tmp/home - curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs - - sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0 + - sh rustup.sh -y --profile=minimal --default-toolchain 1.40.0 - . $HOME/.cargo/env - bash ci/install.sh script: @@ -110,11 +110,11 @@ task: - name: Linux x86_64 env: TARGET: x86_64-unknown-linux-gnu - TOOLCHAIN: 1.36.0 + TOOLCHAIN: 1.40.0 - name: Linux x86_64 musl env: TARGET: x86_64-unknown-linux-musl - TOOLCHAIN: 1.36.0 + TOOLCHAIN: 1.40.0 container: image: rust:1.36 setup_script: diff --git a/CHANGELOG.md b/CHANGELOG.md index a110f650..2201504d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed ### Changed +- Minimum supported Rust version is now 1.40.0. + ([#1356](https://github.com/nix-rust/nix/pull/1356)) + - i686-apple-darwin has been demoted to Tier 2 support, because it's deprecated by Xcode. (#[1350](https://github.com/nix-rust/nix/pull/1350)) @@ -85,7 +85,7 @@ Tier 3: ## Usage -`nix` requires Rust 1.36.0 or newer. +`nix` requires Rust 1.40.0 or newer. To use `nix`, add this to your `Cargo.toml`: diff --git a/test/sys/test_aio.rs b/test/sys/test_aio.rs index 37ad3257..3878da94 100644 --- a/test/sys/test_aio.rs +++ b/test/sys/test_aio.rs @@ -137,6 +137,9 @@ fn test_fsync_error() { // in Travis's version of glibc or Linux. Either way, we must skip the test. // https://github.com/nix-rust/nix/issues/1099 #[cfg_attr(target_os = "linux", ignore)] +// On Cirrus, aio_suspend is failing with EINVAL +// https://github.com/nix-rust/nix/issues/1361 +#[cfg_attr(target_os = "macos", ignore)] fn test_aio_suspend() { const INITIAL: &[u8] = b"abcdef123456"; const WBUF: &[u8] = b"CDEFG"; diff --git a/test/test_unistd.rs b/test/test_unistd.rs index a5c6a332..d169d6e0 100644 --- a/test/test_unistd.rs +++ b/test/test_unistd.rs @@ -1064,13 +1064,7 @@ fn test_ttyname_not_pty() { } #[test] -#[cfg(all(not(target_os = "redox"), not(target_env = "musl")))] +#[cfg(all(not(target_os = "redox")))] fn test_ttyname_invalid_fd() { assert_eq!(ttyname(-1), Err(Error::Sys(Errno::EBADF))); } - -#[test] -#[cfg(all(not(target_os = "redox"), target_env = "musl"))] -fn test_ttyname_invalid_fd() { - assert_eq!(ttyname(-1), Err(Error::Sys(Errno::ENOTTY))); -} |