From c5927f3dab484eeadc1f5892e3bfd49159d9d329 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Mon, 18 Apr 2022 20:22:14 -0600
Subject: [PATCH] Revert "Pin nightly compiler used in CI for uclibc"

This reverts commit 23f18dfc18929965c95e0bcbdb8731645f07e401.

libc v0.2.124 fixes the problem.
---
 .cirrus.yml | 21 +++------------------
 Cargo.toml  |  2 +-
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 358f66c6be..3f21c97d52 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -286,29 +286,14 @@ task:
     - name: OpenBSD x86_64
       env:
         TARGET: x86_64-unknown-openbsd
+    - name: Linux armv7 uclibceabihf
+      env:
+        TARGET: armv7-unknown-linux-uclibceabihf
   setup_script:
     - rustup component add rust-src
   << : *BUILD
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-# uclibc needs its own task for now, due to Rust bug 95866
-# https://github.com/rust-lang/rust/issues/95866
-task:
-  name: Linux armv7 uclibceabihf
-  container:
-    image: rustlang/rust:nightly
-  env:
-    BUILD: check
-    ZFLAGS: -Zbuild-std
-    TARGET: armv7-unknown-linux-uclibceabihf
-    TOOLCHAIN: nightly-2022-04-01
-  setup_script:
-    - rustup toolchain install $TOOLCHAIN --profile minimal
-    - rustup component add --toolchain $TOOLCHAIN rust-src
-    - rustup component add --toolchain $TOOLCHAIN clippy
-  << : *BUILD
-  before_cache_script: rm -rf $CARGO_HOME/registry/index
-
 # Test that we can build with the lowest version of all dependencies.
 # "cargo test" doesn't work because some of our dev-dependencies, like
 # rand, can't build with their own minimal dependencies.
diff --git a/Cargo.toml b/Cargo.toml
index 8842fc90e7..305cc2110e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ targets = [
 ]
 
 [dependencies]
-libc = { version = "0.2.121", features = [ "extra_traits" ] }
+libc = { version = "0.2.124", features = [ "extra_traits" ] }
 bitflags = "1.1"
 cfg-if = "1.0"