Merge pull request #1641 from asomers/0.22.2.1

Prepare release 0.22.3

.cirrus.yml

@@ -17,6 +17,7 @@ task:
     - fetch https://sh.rustup.rs -o rustup.sh
     - sh rustup.sh -y --profile=minimal --default-toolchain 1.41.0
     - $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
+    - cp Cargo.lock.msrv Cargo.lock
   amd64_test_script:
     - . $HOME/.cargo/env
     - cargo test
@@ -49,6 +50,7 @@ task:
     - sh rustup.sh -y --profile=minimal --default-toolchain 1.41.0
     - . $HOME/.cargo/env
     - bash ci/install.sh
+    - cp Cargo.lock.msrv Cargo.lock
   script:
     - . $HOME/.cargo/env
     - bash ci/script.sh
@@ -104,6 +106,7 @@ task:
     - sh rustup.sh -y --profile=minimal --default-toolchain 1.41.0
     - . $HOME/.cargo/env
     - bash ci/install.sh
+    - cp Cargo.lock.msrv Cargo.lock
   script:
     - . $HOME/.cargo/env || true
     - bash ci/script.sh
@@ -112,10 +115,6 @@ task:
 # Tasks for Linux amd64 builds
 task:
   matrix:
-    - name: Rust Stable
-      env:
-        TARGET: x86_64-unknown-linux-gnu
-        TOOLCHAIN: stable
     - name: Linux x86_64
       env:
         TARGET: x86_64-unknown-linux-gnu
@@ -126,6 +125,24 @@ task:
         TOOLCHAIN: 1.41.0
   container:
     image: rust:1.41
+  setup_script:
+    - rustup toolchain install $TOOLCHAIN
+    - rustup target add --toolchain $TOOLCHAIN $TARGET
+    - cp Cargo.lock.msrv Cargo.lock
+  script:
+    - cargo +$TOOLCHAIN build --target $TARGET --all-targets
+    - cargo +$TOOLCHAIN build --target $TARGET --all-targets --release
+    - cargo +$TOOLCHAIN test --target $TARGET
+    - cargo +$TOOLCHAIN test --target $TARGET --release
+  before_cache_script: rm -rf $CARGO_HOME/registry/index
+
+task:
+  name: Rust Stable
+  container:
+    image: rust:latest
+  env:
+    TARGET: x86_64-unknown-linux-gnu
+    TOOLCHAIN: stable
   setup_script:
     - rustup toolchain install $TOOLCHAIN
     - rustup target add --toolchain $TOOLCHAIN $TARGET
@@ -176,6 +193,7 @@ task:
     image: rust:1.41
   setup_script:
     - rustup target add $TARGET
+    - cp Cargo.lock.msrv Cargo.lock
   script:
     - cargo +$TOOLCHAIN check --target $TARGET
     - cargo +$TOOLCHAIN check --target $TARGET --release
@@ -205,9 +223,9 @@ task:
   env:
     TARGET: x86_64-unknown-redox
     # Redox requires a nightly compiler.
-    # If stuff breaks, change nightly to the date in the toolchain_*
-    # directory at https://static.redox-os.org
-    TOOLCHAIN: nightly-2020-08-04
+    # If stuff breaks, change nightly to the date at
+    # https://gitlab.redox-os.org/redox-os/redox/-/blob/master/rust-toolchain
+    TOOLCHAIN: nightly-2021-06-15
   container:
     image: rustlang/rust:nightly
   setup_script:

CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [0.22.3] - 22 January 2022
+### Changed
+
+- Relaxed the bitflags requirement from 1.3.1 to 1.1.  This partially reverts
+  #1492.  From now on, the MSRV is not guaranteed to work with all versions of
+  all dependencies, just with some version of all dependencies.
+  (#[1607](https://github.com/nix-rust/nix/pull/1607))
+
 ## [0.22.2] - 28 September 2021
 ### Added
 ### Changed