From 22e15844aeda2176776264f763551e9fc5e6129b Mon Sep 17 00:00:00 2001 From: Arthur Petukhovsky Date: Mon, 27 Sep 2021 18:59:30 +0300 Subject: [PATCH] Fix clippy errors (#673) --- pageserver/src/layered_repository/interval_tree.rs | 8 ++------ proxy/src/cplane_api.rs | 2 -- proxy/src/proxy.rs | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pageserver/src/layered_repository/interval_tree.rs b/pageserver/src/layered_repository/interval_tree.rs index 562d32d4bf..c98b393b90 100644 --- a/pageserver/src/layered_repository/interval_tree.rs +++ b/pageserver/src/layered_repository/interval_tree.rs @@ -133,11 +133,7 @@ where found_start_point = true; // It is an error to insert the same item to the tree twice. assert!( - point - .elements - .iter() - .find(|x| Arc::ptr_eq(x, &item)) - .is_none(), + !point.elements.iter().any(|x| Arc::ptr_eq(x, &item)), "interval is already in the tree" ); } @@ -180,7 +176,7 @@ where found_start_point = true; } let len_before = point.elements.len(); - point.elements.retain(|other| !Arc::ptr_eq(other, &item)); + point.elements.retain(|other| !Arc::ptr_eq(other, item)); let len_after = point.elements.len(); assert_eq!(len_after + 1, len_before); if len_after == 0 { diff --git a/proxy/src/cplane_api.rs b/proxy/src/cplane_api.rs index 35a6491567..29550a488f 100644 --- a/proxy/src/cplane_api.rs +++ b/proxy/src/cplane_api.rs @@ -1,6 +1,4 @@ use anyhow::{bail, Result}; -use hex; -use reqwest; use serde::{Deserialize, Serialize}; use std::net::{IpAddr, SocketAddr}; diff --git a/proxy/src/proxy.rs b/proxy/src/proxy.rs index e1678ff012..a82fb0f5e4 100644 --- a/proxy/src/proxy.rs +++ b/proxy/src/proxy.rs @@ -192,7 +192,7 @@ impl ProxyConnection { .write_message_noflush(&BeMessage::ParameterStatus)?; self.pgb.write_message(&BeMessage::ReadyForQuery)?; - return Ok(conn_info); + Ok(conn_info) } } } else {