From 9c5e719985dfdd0acc7524655931a71bcbed6154 Mon Sep 17 00:00:00 2001 From: Lucas Kent Date: Fri, 12 Aug 2022 08:44:01 +1000 Subject: [PATCH] Update to rust 1.63 --- rust-toolchain.toml | 2 +- shotover-proxy/src/lib.rs | 2 ++ shotover-proxy/src/message/mod.rs | 6 +++--- shotover-proxy/src/transforms/protect/crypto.rs | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6696ec764..993f2cc7e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.62" +channel = "1.63" components = [ "rustfmt", "clippy" ] diff --git a/shotover-proxy/src/lib.rs b/shotover-proxy/src/lib.rs index d063f0394..91aae115a 100644 --- a/shotover-proxy/src/lib.rs +++ b/shotover-proxy/src/lib.rs @@ -17,6 +17,8 @@ //! * [`transforms::Transforms`], the enum to register with (add a variant) for enabling your own transform. //! * [`transforms::TransformsConfig`], the enum to register with (add a variant) for configuring your own transform. +#![allow(clippy::derive_partial_eq_without_eq)] + pub mod codec; mod concurrency; pub mod config; diff --git a/shotover-proxy/src/message/mod.rs b/shotover-proxy/src/message/mod.rs index 08a17e2da..550cc3775 100644 --- a/shotover-proxy/src/message/mod.rs +++ b/shotover-proxy/src/message/mod.rs @@ -278,9 +278,9 @@ impl Message { bytes, message_type, } => match message_type { - MessageType::Cassandra => Ok(Metadata::Cassandra(cassandra::raw_frame::metadata( - &*bytes, - )?)), + MessageType::Cassandra => { + Ok(Metadata::Cassandra(cassandra::raw_frame::metadata(bytes)?)) + } MessageType::Redis => Ok(Metadata::Redis), MessageType::None => Ok(Metadata::None), }, diff --git a/shotover-proxy/src/transforms/protect/crypto.rs b/shotover-proxy/src/transforms/protect/crypto.rs index 141f47a78..a010c4862 100644 --- a/shotover-proxy/src/transforms/protect/crypto.rs +++ b/shotover-proxy/src/transforms/protect/crypto.rs @@ -20,7 +20,7 @@ pub async fn encrypt( key_management: &KeyManager, key_id: &str, ) -> Result { - let value = MessageValue::from(&*value); + let value = MessageValue::from(value); let sym_key = key_management.cached_get_key(key_id, None, None).await?;