style: satisfy clippy

loyd · loyd · commit 5433ec67740b · 2023-02-17T14:03:19.000+08:00
diff --git a/benches/insert.rs b/benches/insert.rs
@@ -76,7 +76,7 @@ fn insert(c: &mut Criterion) {
         b.iter_custom(|iters| {
             let rt = Runtime::new().unwrap();
             let client = Client::default()
-                .with_url(format!("http://{}", addr))
+                .with_url(format!("http://{addr}"))
                 .with_compression(Compression::None);
             rt.block_on(run(client, iters)).unwrap()
         })
@@ -86,7 +86,7 @@ fn insert(c: &mut Criterion) {
         b.iter_custom(|iters| {
             let rt = Runtime::new().unwrap();
             let client = Client::default()
-                .with_url(format!("http://{}", addr))
+                .with_url(format!("http://{addr}"))
                 .with_compression(Compression::Lz4);
             rt.block_on(run(client, iters)).unwrap()
         })
@@ -96,7 +96,7 @@ fn insert(c: &mut Criterion) {
         b.iter_custom(|iters| {
             let rt = Runtime::new().unwrap();
             let client = Client::default()
-                .with_url(format!("http://{}", addr))
+                .with_url(format!("http://{addr}"))
                 .with_compression(Compression::Lz4Hc(4));
             rt.block_on(run(client, iters)).unwrap()
         })
diff --git a/benches/select.rs b/benches/select.rs
@@ -16,7 +16,7 @@ mod server {
     use tokio::runtime;
 
     async fn handle(req: Request<Body>) -> Result<Response<Body>, Infallible> {
-        let _ = body::aggregate(req.into_body());
+        let _ = body::aggregate(req.into_body()).await;
         let chunk = Bytes::from_static(&[15; 128 * 1024]);
         let stream = stream::repeat(Ok::<Bytes, &'static str>(chunk));
         let body = Body::wrap_stream(stream);
@@ -70,7 +70,7 @@ fn select(c: &mut Criterion) {
         b.iter_custom(|iters| {
             let rt = Runtime::new().unwrap();
             let client = Client::default()
-                .with_url(format!("http://{}", addr))
+                .with_url(format!("http://{addr}"))
                 .with_compression(Compression::None);
             let start = Instant::now();
             rt.block_on(run(client, iters)).unwrap();
diff --git a/examples/enums.rs b/examples/enums.rs
@@ -64,7 +64,7 @@ async fn main() -> Result<()> {
         .query("SELECT ?fields FROM event_log")
         .fetch_all::<Event>()
         .await?;
-    println!("{:?}", events);
+    println!("{events:?}");
 
     Ok(())
 }
diff --git a/examples/mock.rs b/examples/mock.rs
@@ -63,7 +63,7 @@ async fn main() {
     // How to test failures.
     mock.add(test::handlers::failure(test::status::FORBIDDEN));
     let reason = make_select(&client).await;
-    assert_eq!(format!("{:?}", reason), r#"Err(BadResponse("Forbidden"))"#);
+    assert_eq!(format!("{reason:?}"), r#"Err(BadResponse("Forbidden"))"#);
 
     // How to test INSERT.
     let recording = mock.add(test::handlers::record());
diff --git a/examples/usage.rs b/examples/usage.rs
@@ -67,7 +67,7 @@ async fn fetch(client: &Client) -> Result<()> {
         .fetch::<MyRow<'_>>()?;
 
     while let Some(row) = cursor.next().await? {
-        println!("{:?}", row);
+        println!("{row:?}");
     }
 
     Ok(())
@@ -82,7 +82,7 @@ async fn fetch_all(client: &Client) -> Result<()> {
         .fetch_all::<MyRowOwned>()
         .await?;
 
-    println!("{:?}", vec);
+    println!("{vec:?}");
 
     Ok(())
 }
@@ -105,7 +105,7 @@ async fn select_count(client: &Client) -> Result<()> {
         .fetch_one::<u64>()
         .await?;
 
-    println!("count() = {}", count);
+    println!("count() = {count}");
 
     Ok(())
 }
@@ -117,7 +117,7 @@ async fn watch(client: &Client) -> Result<()> {
         .fetch::<MyRow<'_>>()?;
 
     let (version, row) = cursor.next().await?.unwrap();
-    println!("version={}, row={:?}", version, row);
+    println!("version={version}, row={row:?}");
 
     let mut insert = client.insert("some")?;
     let row = MyRow {
@@ -128,7 +128,7 @@ async fn watch(client: &Client) -> Result<()> {
     insert.end().await?;
 
     let (version, row) = cursor.next().await?.unwrap();
-    println!("version={}, row={:?}", version, row);
+    println!("version={version}, row={row:?}");
 
     // Or you can request only events without data.
     let mut cursor = client
diff --git a/src/insert.rs b/src/insert.rs
@@ -71,7 +71,7 @@ impl<T> Insert<T> {
 
         // TODO: what about escaping a table name?
         // https://clickhouse.yandex/docs/en/query_language/syntax/#syntax-identifiers
-        let query = format!("INSERT INTO {}({}) FORMAT RowBinary", table, fields);
+        let query = format!("INSERT INTO {table}({fields}) FORMAT RowBinary");
         pairs.append_pair("query", &query);
 
         if client.compression.is_lz4() {
@@ -225,7 +225,7 @@ impl<T> Insert<T> {
         match timeout!(self, end_timeout, &mut self.handle) {
             Some(Ok(res)) => res,
             Some(Err(err)) if err.is_panic() => panic::resume_unwind(err.into_panic()),
-            Some(Err(err)) => Err(Error::Custom(format!("unexpected error: {}", err))),
+            Some(Err(err)) => Err(Error::Custom(format!("unexpected error: {err}"))),
             None => {
                 // We can do nothing useful here, so just shut down the background task.
                 self.handle.abort();
diff --git a/src/test/mock.rs b/src/test/mock.rs
@@ -74,7 +74,7 @@ impl Mock {
         tokio::spawn(server);
 
         Self {
-            url: format!("http://{}", addr),
+            url: format!("http://{addr}"),
             tx,
             responses_left: responses_left_0,
             non_exhaustive: false,
diff --git a/src/watch.rs b/src/watch.rs
@@ -241,7 +241,7 @@ async fn init_cursor<T>(client: &Client, params: &WatchParams) -> Result<JsonCur
     let mut watch_sql = format!("WATCH {}{}", params.view, events);
 
     if let Some(limit) = params.limit {
-        let _ = write!(&mut watch_sql, " LIMIT {}", limit);
+        let _ = write!(&mut watch_sql, " LIMIT {limit}");
     }
 
     watch_sql.push_str(" FORMAT JSONEachRowWithProgress");
@@ -262,10 +262,10 @@ fn make_live_view_name(sql: &str) -> String {
 
     let mut name = String::with_capacity(40);
     for word in &result[..] {
-        let _ = write!(&mut name, "{:02x}", word);
+        let _ = write!(&mut name, "{word:02x}");
     }
 
-    format!("lv_{}", name)
+    format!("lv_{name}")
 }
 
 #[test]
diff --git a/tests/test_uuid.rs b/tests/test_uuid.rs
@@ -34,7 +34,7 @@ async fn smoke() {
         .unwrap();
 
     let uuid = Uuid::new_v4();
-    println!("uuid: {}", uuid);
+    println!("uuid: {uuid}");
 
     let original_row = MyRow {
         uuid,

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ async fn main() -> Result<()> {`
`64`	`64`	`.query("SELECT ?fields FROM event_log")`
`65`	`65`	`.fetch_all::<Event>()`
`66`	`66`	`.await?;`
`67`		`- println!("{:?}", events);`
	`67`	`+ println!("{events:?}");`
`68`	`68`
`69`	`69`	`Ok(())`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ async fn init_cursor<T>(client: &Client, params: &WatchParams) -> Result<JsonCur`
`241`	`241`	`let mut watch_sql = format!("WATCH {}{}", params.view, events);`
`242`	`242`
`243`	`243`	`if let Some(limit) = params.limit {`
`244`		`- let _ = write!(&mut watch_sql, " LIMIT {}", limit);`
	`244`	`+ let _ = write!(&mut watch_sql, " LIMIT {limit}");`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`watch_sql.push_str(" FORMAT JSONEachRowWithProgress");`
`@@ -262,10 +262,10 @@ fn make_live_view_name(sql: &str) -> String {`
`262`	`262`
`263`	`263`	`let mut name = String::with_capacity(40);`
`264`	`264`	`for word in &result[..] {`
`265`		`- let _ = write!(&mut name, "{:02x}", word);`
	`265`	`+ let _ = write!(&mut name, "{word:02x}");`
`266`	`266`	`}`
`267`	`267`
`268`		`- format!("lv_{}", name)`
	`268`	`+ format!("lv_{name}")`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`#[test]`