From d1816b662f9e011ee97c30f3cf64e316d718d885 Mon Sep 17 00:00:00 2001
From: Edd Robinson <me@edd.io>
Date: Thu, 13 Jan 2022 21:12:46 +0000
Subject: [PATCH] chore: update rust to 1.58 (#3461)

* chore: update rust to 1.58

* fix: clippy

Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>
---
 data_types/src/chunk_metadata.rs | 10 ++--------
 grpc-router/src/router.rs        |  2 +-
 read_buffer/src/column.rs        |  4 ++--
 rust-toolchain.toml              |  2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/data_types/src/chunk_metadata.rs b/data_types/src/chunk_metadata.rs
index 089e23bc8c..c7e2c12958 100644
--- a/data_types/src/chunk_metadata.rs
+++ b/data_types/src/chunk_metadata.rs
@@ -350,14 +350,8 @@ mod tests {
         // Random chunk IDs use UUID-format
         let id_random = ChunkId::new();
         let inner: Uuid = id_random.get();
-        assert_eq!(
-            format!("{:?}", id_random),
-            format!("ChunkId({})", inner.to_string())
-        );
-        assert_eq!(
-            format!("{}", id_random),
-            format!("ChunkId({})", inner.to_string())
-        );
+        assert_eq!(format!("{:?}", id_random), format!("ChunkId({})", inner));
+        assert_eq!(format!("{}", id_random), format!("ChunkId({})", inner));
 
         // Deterministic IDs use integer format
         let id_test = ChunkId::new_test(42);
diff --git a/grpc-router/src/router.rs b/grpc-router/src/router.rs
index 54c2721b78..8382c84215 100644
--- a/grpc-router/src/router.rs
+++ b/grpc-router/src/router.rs
@@ -201,7 +201,7 @@ pub mod tests {
             let addr: SocketAddr = "127.0.0.1:0".parse()?;
             let listener = tokio::net::TcpListener::bind(addr).await?;
             let local_addr = listener.local_addr()?;
-            let local_addr = format!("http://{}", local_addr.to_string());
+            let local_addr = format!("http://{}", local_addr);
 
             tokio::spawn(async move {
                 Server::builder()
diff --git a/read_buffer/src/column.rs b/read_buffer/src/column.rs
index 00caaa0af5..6aa6b75b76 100644
--- a/read_buffer/src/column.rs
+++ b/read_buffer/src/column.rs
@@ -2204,7 +2204,7 @@ mod test {
             Column::Unsigned(_, IntegerEncoding::U64(_, _))
         ));
 
-        for (scalar, result) in cases.clone() {
+        for (scalar, result) in cases {
             assert_eq!(col.might_contain_value(&Value::Scalar(scalar)), result);
         }
 
@@ -2217,7 +2217,7 @@ mod test {
             (Scalar::F64(-100.0), false),
         ];
 
-        for (scalar, result) in cases.clone() {
+        for (scalar, result) in cases {
             assert_eq!(col.might_contain_value(&Value::Scalar(scalar)), result);
         }
     }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 2d8362447b..116305a03d 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.57"
+channel = "1.58"
 components = [ "rustfmt", "clippy" ]