Skip to content

Commit 916bbfa

Browse files
bors[bot]rtzoeller
andauthored
Merge #1610
1610: Re-enable deprecation warnings on DragonFly r=asomers a=rtzoeller Reverts 0df82de and ac159d9. Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
2 parents f8e2750 + 3674d58 commit 916bbfa

File tree

2 files changed

+6
-36
lines changed

2 files changed

+6
-36
lines changed

.cirrus.yml

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -265,32 +265,6 @@ task:
265265
<< : *BUILD
266266
before_cache_script: rm -rf $CARGO_HOME/registry/index
267267

268-
# DragonflyBSD temporarily needs a pinned nightly toolchain
269-
# rustc is broken on DragonflyBSD as of Dec-5, probably by
270-
# https://github.com/rust-lang/rust/commit/e68887e67cc6b7bb4ea5113a40eaa4c0831bda13
271-
task:
272-
container:
273-
image: rust:1.46
274-
name: DragonFly BSD x86_64
275-
env:
276-
BUILD: check
277-
ZFLAGS: -Zbuild-std
278-
TARGET: x86_64-unknown-dragonfly
279-
# Redox requires a nightly compiler.
280-
# If stuff breaks, change nightly to the date at
281-
# https://gitlab.redox-os.org/redox-os/redox/-/blob/master/rust-toolchain
282-
TOOLCHAIN: nightly-2021-12-04
283-
# Temporarily allow deprecation on DragonflyBSD until an alternative is
284-
# available.
285-
#https://github.com/rust-lang/libc/pull/2522
286-
RUSTFLAGS: -D warnings -A deprecated
287-
setup_script:
288-
- rustup toolchain add $TOOLCHAIN --profile minimal
289-
- rustup component add rust-src --toolchain $TOOLCHAIN
290-
- rustup component add clippy --toolchain $TOOLCHAIN
291-
<< : *BUILD
292-
before_cache_script: rm -rf $CARGO_HOME/registry/index
293-
294268
# Rust Tier 3 targets can't use Rustup
295269
task:
296270
container:
@@ -300,6 +274,9 @@ task:
300274
TOOLCHAIN: nightly
301275
ZFLAGS: -Zbuild-std
302276
matrix:
277+
- name: DragonFly BSD x86_64
278+
env:
279+
TARGET: x86_64-unknown-dragonfly
303280
- name: OpenBSD x86_64
304281
env:
305282
TARGET: x86_64-unknown-openbsd

Cargo.lock.msrv

Lines changed: 3 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)