Merge "Upgrade rust/crates/nix to 0.22.1" am: eee0bbf293 am: 7e7a7d9843

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nix/+/1832968

Change-Id: I3d259f910bd3fb5b74dc4fb1295fb15a574e7d04

8 files changed, 28 insertions, 25 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 3433190..fb7ddb9 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "5dd14c39b88fb6eb25ad670435d1a79ba294b21e"
+    "sha1": "b29a85165b0bf494974642cc6ba58a924f143948"
   }
 }
diff --git a/Android.bp b/Android.bp
index 1fe2da1..7473efb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,8 @@ rust_library {
     name: "libnix",
     host_supported: true,
     crate_name: "nix",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.22.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -39,10 +41,3 @@ rust_library {
         "com.android.virt",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   bitflags-1.2.1 "default"
-//   cfg-if-1.0.0
-//   libc-0.2.98 "default,extra_traits,std"
-//   memoffset-0.6.4 "default"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21cb4b8..5367d7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,12 +3,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
-## [Unreleased] - ReleaseDate
+## [0.22.1] - 13 August 2021
 ### Added
 ### Changed
 ### Fixed
+
+- Locked bitflags to < 1.3.0 to fix the build with rust < 1.46.0.
+
 ### Removed
 
+- Removed a couple of termios constants on redox that were never actually
+  supported.
+  (#[1483](https://github.com/nix-rust/nix/pull/1483))
+
 ## [0.22.0] - 9 July 2021
 ### Added
 - Added `if_nameindex` (#[1445](https://github.com/nix-rust/nix/pull/1445))
diff --git a/Cargo.toml b/Cargo.toml
index a111b80..09c5a73 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,17 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
 
 [package]
 edition = "2018"
 name = "nix"
-version = "0.22.0"
+version = "0.22.1"
 authors = ["The nix-rust Project Developers"]
 exclude = ["/.gitignore", "/.cirrus.yml", "/ci/*", "/Cross.toml", "/RELEASE_PROCEDURE.md", "/bors.toml"]
 description = "Rust friendly bindings to *nix APIs"
@@ -48,13 +47,13 @@ harness = false
 name = "test-ptymaster-drop"
 path = "test/test_ptymaster_drop.rs"
 [dependencies.bitflags]
-version = "1.1"
+version = ">= 1.1.0, < 1.3.0"
 
 [dependencies.cfg-if]
 version = "1.0"
 
 [dependencies.libc]
-version = "0.2.98"
+version = "0.2.99"
 features = ["extra_traits"]
 [dev-dependencies.assert-impl]
 version = "0.1"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index c5cdd08..7a527d3 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -2,7 +2,7 @@
 name        = "nix"
 description = "Rust friendly bindings to *nix APIs"
 edition     = "2018"
-version     = "0.22.0"
+version     = "0.22.1"
 authors     = ["The nix-rust Project Developers"]
 repository  = "https://github.com/nix-rust/nix"
 license     = "MIT"
@@ -32,8 +32,8 @@ targets = [
 ]
 
 [dependencies]
-libc = { version = "0.2.98", features = [ "extra_traits" ] }
-bitflags = "1.1"
+libc = { version = "0.2.99", features = [ "extra_traits" ] }
+bitflags = ">= 1.1.0, < 1.3.0"
 cfg-if = "1.0"
 
 [target.'cfg(not(target_os = "redox"))'.dependencies]
diff --git a/METADATA b/METADATA
index bb088b2..163016d 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/nix/nix-0.22.0.crate"
+    value: "https://static.crates.io/crates/nix/nix-0.22.1.crate"
   }
-  version: "0.22.0"
+  version: "0.22.1"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 8
-    day: 9
+    month: 9
+    day: 22
   }
 }
diff --git a/README.md b/README.md
index 895ef1e..566043f 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ To use `nix`, add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-nix = "0.22.0"
+nix = "0.22.1"
 ```
 
 ## Contributing
diff --git a/src/sys/termios.rs b/src/sys/termios.rs
index 9abae9d..36a3601 100644
--- a/src/sys/termios.rs
+++ b/src/sys/termios.rs
@@ -599,7 +599,9 @@ libc_bitflags! {
         ICRNL;
         IXON;
         IXOFF;
+        #[cfg(not(target_os = "redox"))]
         IXANY;
+        #[cfg(not(target_os = "redox"))]
         IMAXBEL;
         #[cfg(any(target_os = "android", target_os = "linux", target_os = "macos"))]
         IUTF8;