chore(tvix/clippy): configure clippy allow block_in_conditions

… in Cargo.toml.

This gets an imperative `cargo clippy` run to pick up that config,
so `-A clippy::blocks_in_conditions` doesn't need to be explicitly
specified anymore.

Change-Id: I32b6cc50c77c22cba0d816d0db508c2f94b2c383
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11659
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: edef <edef@edef.eu>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-05-13 18:42:50 +02:00 committed by clbot
parent 14353ce751
commit afcbc1d86d
5 changed files with 15 additions and 3 deletions

View file

@ -30,6 +30,11 @@ members = [
"store", "store",
] ]
[workspace.lints.clippy]
# Allow blocks_in_conditions due to false positives with #[tracing::instrument(…)]:
# https://github.com/rust-lang/rust-clippy/issues/12281
blocks_in_conditions = "allow"
# Add a profile to all targets that enables release optimisations, but # Add a profile to all targets that enables release optimisations, but
# retains debug symbols. This is great for use with # retains debug symbols. This is great for use with
# benchmarking/profiling tools. # benchmarking/profiling tools.

View file

@ -31,3 +31,6 @@ tonic-reflection = ["dep:tonic-reflection"]
[dev-dependencies] [dev-dependencies]
rstest = "0.19.0" rstest = "0.19.0"
[lints]
workspace = true

View file

@ -116,3 +116,6 @@ tonic-reflection = ["dep:tonic-reflection"]
# Requires the following packages in $PATH: # Requires the following packages in $PATH:
# cbtemulator, google-cloud-bigtable-tool # cbtemulator, google-cloud-bigtable-tool
integration = [] integration = []
[lints]
workspace = true

View file

@ -224,9 +224,7 @@ in
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
]; ];
# Allow blocks_in_conditions due to false positives with #[tracing::instrument(…)]: buildPhase = "cargo clippy --tests --all-features --benches --examples -- -Dwarnings | tee $out";
# https://github.com/rust-lang/rust-clippy/issues/12281
buildPhase = "cargo clippy --tests --all-features --benches --examples -- -Dwarnings -A clippy::blocks_in_conditions | tee $out";
}; };
meta.ci.targets = [ meta.ci.targets = [

View file

@ -79,3 +79,6 @@ virtiofs = ["tvix-castore/virtiofs"]
# Requires the following packages in $PATH: # Requires the following packages in $PATH:
# cbtemulator, google-cloud-bigtable-tool # cbtemulator, google-cloud-bigtable-tool
integration = [] integration = []
[lints]
workspace = true