Merge #1591

1591: Fix CI r=asomers a=asomers

* Update Redox compiler
* Fix "unknown lint clippy::if_then_panic"

Co-authored-by: Alan Somers <asomers@gmail.com>

Author: bors[bot]

.cirrus.yml

@@ -5,7 +5,6 @@ cargo_cache:
 env:
   # Build by default; don't just check
   BUILD: build
-  CLIPPYFLAGS: -D warnings
   RUSTFLAGS: -D warnings
   RUSTDOCFLAGS: -D warnings
   TOOL: cargo
@@ -19,7 +18,7 @@ build: &BUILD
     - . $HOME/.cargo/env || true
     - $TOOL +$TOOLCHAIN $BUILD $ZFLAGS --target $TARGET --all-targets
     - $TOOL +$TOOLCHAIN doc $ZFLAGS --no-deps --target $TARGET
-    - $TOOL +$TOOLCHAIN clippy $ZFLAGS --target $TARGET -- $CLIPPYFLAGS
+    - $TOOL +$TOOLCHAIN clippy $ZFLAGS --target $TARGET -- -D warnings
 
 # Tests that do require executing the binaries
 test: &TEST
@@ -224,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
   setup_script:
     - rustup target add $TARGET
     - rustup toolchain install $TOOLCHAIN --profile minimal --target $TARGET
@@ -240,16 +239,16 @@ task:
     image: rustlang/rust:nightly
   env:
     BUILD: check
-    # Must allow here rather than in lib.rs because this lint doesn't exist
-    # prior to Rust 1.57.0
-    # https://github.com/rust-lang/rust-clippy/issues/7718
-    CLIPPYFLAGS: -D warnings -A clippy::if_then_panic
     TOOLCHAIN: nightly
     ZFLAGS: -Zbuild-std
   matrix:
     - name: DragonFly BSD x86_64
       env:
         TARGET: x86_64-unknown-dragonfly
+        # Temporarily allow deprecation on DragonflyBSD until an alternative is
+        # available.
+        #https://github.com/rust-lang/libc/pull/2522
+        RUSTFLAGS: -D warnings -A deprecated
     - name: OpenBSD x86_64
       env:
         TARGET: x86_64-unknown-openbsd