From 73c65d4c1ab2cfe8db12f99377cceab0f61c31d3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 8 Jun 2022 17:08:40 +0100 Subject: [PATCH 1/2] clippy: Allow dbg in tests *again* *sigh* --- .gitlab-ci.yml | 1 + clippy-nightly.toml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 clippy-nightly.toml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebe630dd1..dbd73a9b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,6 +86,7 @@ rust-nightly: # The --cfg allows us to write #![cfg_attr(ci_arti_nightly, allow(clippy::needless_borrow))] # and similar, for when nightly clippy has false positives. (There is no builtin # cfg flag for nightly, and a cargo "feature" would be bad with --all-features.) + - (echo; cat clippy-nightly.toml) >>clippy.toml - cargo clippy --all-features --tests -- --cfg ci_arti_nightly -D clippy::dbg_macro -D clippy::print_stdout -D clippy::print_stderr - RUSTDOCFLAGS="-Dwarnings" cargo doc --all-features --document-private-items --no-deps tags: diff --git a/clippy-nightly.toml b/clippy-nightly.toml new file mode 100644 index 000000000..4ccceb2b7 --- /dev/null +++ b/clippy-nightly.toml @@ -0,0 +1,6 @@ +# Config options appended to clippy.toml whne we run Nightly clippy +# +# We must edit the tree, this way, sadly: +# https://github.com/rust-lang/rust-clippy/issues/8973 + +allow-dbg-in-tests = true From 38fcca7847832cc28cdf68c9f4f9c9b45276e172 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 9 Jun 2022 14:08:48 +0000 Subject: [PATCH 2/2] Fix typo in clippy-nightly.toml --- clippy-nightly.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clippy-nightly.toml b/clippy-nightly.toml index 4ccceb2b7..a0df6e2c4 100644 --- a/clippy-nightly.toml +++ b/clippy-nightly.toml @@ -1,4 +1,4 @@ -# Config options appended to clippy.toml whne we run Nightly clippy +# Config options appended to clippy.toml when we run Nightly clippy # # We must edit the tree, this way, sadly: # https://github.com/rust-lang/rust-clippy/issues/8973