From 6f46d097f8e8afd8a9ff518c270a513762c74736 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Fri, 7 May 2021 06:04:07 -0400 Subject: [PATCH 1/2] chore: revert to Rust 1.51.0 --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index d4f820371f..d2d62553b3 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.52.0 \ No newline at end of file +1.51.0 \ No newline at end of file From c6a8cd15019547e966ea73b14b1cbf7b93033c2d Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Fri, 7 May 2021 06:20:57 -0400 Subject: [PATCH 2/2] fix: clippy --- influxdb_tsm/src/reader.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/influxdb_tsm/src/reader.rs b/influxdb_tsm/src/reader.rs index 54a730b4dc..03bc48497c 100644 --- a/influxdb_tsm/src/reader.rs +++ b/influxdb_tsm/src/reader.rs @@ -459,7 +459,6 @@ impl BlockData { /// overwrites previous values. Therefore, in order to have "last write /// wins" semantics it is important that the provided vector of blocks /// is ordered by the wall-clock time the blocks were created. - #[allow(clippy::manual_flatten)] // https://github.com/rust-lang/rust-clippy/issues/6784 pub fn merge(mut blocks: Vec) -> Self { if blocks.is_empty() { panic!("merge called with zero blocks");