summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Zoeller <rtzoeller@rtzoeller.com>2021-12-19 13:34:09 -0600
committerRyan Zoeller <rtzoeller@rtzoeller.com>2022-01-12 22:03:55 -0600
commit3674d58b6fb2d1533fa3a5ae2daeb014a6004b75 (patch)
treec883362f6fdb8b276f5b3ba89c77b26b046184c4
parentf6268d984489f0304565cf996e3d9396da540a0a (diff)
downloadnix-3674d58b6fb2d1533fa3a5ae2daeb014a6004b75.zip
Re-enable deprecation warnings on DragonFly
Use latest nightly compiler.
-rw-r--r--.cirrus.yml29
-rw-r--r--Cargo.lock.msrv13
2 files changed, 6 insertions, 36 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 4e1da038..c6f4e0b2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -265,32 +265,6 @@ task:
<< : *BUILD
before_cache_script: rm -rf $CARGO_HOME/registry/index
-# DragonflyBSD temporarily needs a pinned nightly toolchain
-# rustc is broken on DragonflyBSD as of Dec-5, probably by
-# https://github.com/rust-lang/rust/commit/e68887e67cc6b7bb4ea5113a40eaa4c0831bda13
-task:
- container:
- image: rust:1.46
- name: DragonFly BSD x86_64
- env:
- BUILD: check
- ZFLAGS: -Zbuild-std
- TARGET: x86_64-unknown-dragonfly
- # Redox requires a nightly compiler.
- # If stuff breaks, change nightly to the date at
- # https://gitlab.redox-os.org/redox-os/redox/-/blob/master/rust-toolchain
- TOOLCHAIN: nightly-2021-12-04
- # Temporarily allow deprecation on DragonflyBSD until an alternative is
- # available.
- #https://github.com/rust-lang/libc/pull/2522
- RUSTFLAGS: -D warnings -A deprecated
- setup_script:
- - rustup toolchain add $TOOLCHAIN --profile minimal
- - rustup component add rust-src --toolchain $TOOLCHAIN
- - rustup component add clippy --toolchain $TOOLCHAIN
- << : *BUILD
- before_cache_script: rm -rf $CARGO_HOME/registry/index
-
# Rust Tier 3 targets can't use Rustup
task:
container:
@@ -300,6 +274,9 @@ task:
TOOLCHAIN: nightly
ZFLAGS: -Zbuild-std
matrix:
+ - name: DragonFly BSD x86_64
+ env:
+ TARGET: x86_64-unknown-dragonfly
- name: OpenBSD x86_64
env:
TARGET: x86_64-unknown-openbsd
diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv
index 955bccf4..a917bb6b 100644
--- a/Cargo.lock.msrv
+++ b/Cargo.lock.msrv
@@ -38,12 +38,6 @@ dependencies = [
]
[[package]]
-name = "cc"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db2f146208d7e0fbee761b09cd65a7f51ccc38705d4e7262dad4d73b12a76b1"
-
-[[package]]
name = "cfg-if"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -104,9 +98,9 @@ checksum = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
[[package]]
name = "libc"
-version = "0.2.102"
+version = "0.2.112"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
[[package]]
name = "lock_api"
@@ -128,12 +122,11 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.23.0"
+version = "0.23.1"
dependencies = [
"assert-impl",
"bitflags",
"caps",
- "cc",
"cfg-if 1.0.0",
"lazy_static",
"libc",