Bump to 2021 edition, inline formats, lints

* Bump Rust edition 2018 -> 2021
* Use new inline formatting, i.e. `format!("{v}")` instead of `format!("{}", v)` (simple cases only)
* use more specific asserts like `assert_ne!`
* ignore intellij IDE files
* remove a few un-needed namespace prefixes

Author: nyurik

.gitignore

@@ -2,4 +2,5 @@
 /target/
 **/*.rs.bk
 Cargo.lock
-*~
+*~
+.idea/

bb8/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.8.0"
 description = "Full-featured async (tokio-based) connection pool (like r2d2)"
 license = "MIT"
 repository = "https://github.com/djc/bb8"
-edition = "2018"
+edition = "2021"
 workspace = ".."
 readme = "../README.md"
 

bb8/src/api.rs

@@ -157,13 +157,14 @@ impl<M: ManageConnection> Builder<M> {
     /// If set, connections will be closed at the next reaping after surviving
     /// past this duration.
     ///
-    /// If a connection reachs its maximum lifetime while checked out it will be
+    /// If a connection reaches its maximum lifetime while checked out it will be
     /// closed when it is returned to the pool.
     ///
     /// Defaults to 30 minutes.
     pub fn max_lifetime(mut self, max_lifetime: Option<Duration>) -> Builder<M> {
-        assert!(
-            max_lifetime != Some(Duration::from_secs(0)),
+        assert_ne!(
+            max_lifetime,
+            Some(Duration::from_secs(0)),
             "max_lifetime must be greater than zero!"
         );
         self.max_lifetime = max_lifetime;
@@ -177,8 +178,9 @@ impl<M: ManageConnection> Builder<M> {
     ///
     /// Defaults to 10 minutes.
     pub fn idle_timeout(mut self, idle_timeout: Option<Duration>) -> Builder<M> {
-        assert!(
-            idle_timeout != Some(Duration::from_secs(0)),
+        assert_ne!(
+            idle_timeout,
+            Some(Duration::from_secs(0)),
             "idle_timeout must be greater than zero!"
         );
         self.idle_timeout = idle_timeout;
@@ -277,7 +279,7 @@ pub trait ManageConnection: Sized + Send + Sync + 'static {
 /// A trait which provides functionality to initialize a connection
 #[async_trait]
 pub trait CustomizeConnection<C: Send + 'static, E: 'static>:
-    std::fmt::Debug + Send + Sync + 'static
+    fmt::Debug + Send + Sync + 'static
 {
     /// Called with connections immediately after they are returned from
     /// `ManageConnection::connect`.
@@ -380,7 +382,7 @@ where
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            RunError::User(ref err) => write!(f, "{}", err),
+            RunError::User(ref err) => write!(f, "{err}"),
             RunError::TimedOut => write!(f, "Timed out in bb8"),
         }
     }

bb8/tests/test.rs

@@ -8,7 +8,7 @@ use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::Mutex;
 use std::task::Poll;
 use std::time::Duration;
-use std::{error, fmt, mem};
+use std::{error, fmt};
 
 use async_trait::async_trait;
 use futures_channel::oneshot;
@@ -270,7 +270,7 @@ async fn test_lazy_initialization_failure() {
         .build_unchecked(manager);
 
     let res = pool.get().await;
-    assert_eq!(res.unwrap_err(), bb8::RunError::TimedOut);
+    assert_eq!(res.unwrap_err(), RunError::TimedOut);
 }
 
 #[tokio::test]
@@ -547,7 +547,7 @@ async fn test_conns_drop_on_pool_drop() {
         .await
         .unwrap();
 
-    mem::drop(pool);
+    drop(pool);
 
     for _ in 0u8..10 {
         if DROPPED.load(Ordering::SeqCst) == 10 {
@@ -741,7 +741,7 @@ async fn test_customize_connection_acquire() {
 
     #[derive(Debug, Default)]
     struct CountingCustomizer {
-        count: std::sync::atomic::AtomicUsize,
+        count: AtomicUsize,
     }
 
     #[async_trait]

postgres/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.8.0"
 description = "Full-featured async (tokio-based) postgres connection pool (like r2d2)"
 license = "MIT"
 repository = "https://github.com/djc/bb8"
-edition = "2018"
+edition = "2021"
 
 [features]
 "with-bit-vec-0_6" = ["tokio-postgres/with-bit-vec-0_6"]

postgres/examples/custom_state.rs

@@ -15,9 +15,7 @@ use tokio_postgres::{Client, Error, Socket, Statement};
 // docker run --name gotham-middleware-postgres -e POSTGRES_PASSWORD=mysecretpassword -p 5432:5432 -d postgres
 #[tokio::main]
 async fn main() {
-    let config =
-        tokio_postgres::config::Config::from_str("postgresql://postgres:docker@localhost:5432")
-            .unwrap();
+    let config = Config::from_str("postgresql://postgres:docker@localhost:5432").unwrap();
     let pg_mgr = CustomPostgresConnectionManager::new(config, tokio_postgres::NoTls);
 
     let pool = Pool::builder()

postgres/examples/hyper.rs

@@ -16,13 +16,13 @@ async fn main() {
 
     let pg_mgr = PostgresConnectionManager::new_from_stringlike(
         "postgresql://postgres:mysecretpassword@localhost:5432",
-        tokio_postgres::NoTls,
+        NoTls,
     )
     .unwrap();
 
     let pool = match Pool::builder().build(pg_mgr).await {
         Ok(pool) => pool,
-        Err(e) => panic!("bb8 error {}", e),
+        Err(e) => panic!("bb8 error {e}"),
     };
 
     let _ = Server::bind(&addr)
@@ -40,7 +40,7 @@ async fn main() {
                             }
                             Err(e) => {
                                 println!("Sending error response");
-                                Response::new(Body::from(format!("Internal error {:?}", e)))
+                                Response::new(Body::from(format!("Internal error {e:?}")))
                             }
                         })
                     }
@@ -57,5 +57,5 @@ async fn handler(
     let stmt = conn.prepare("SELECT 1").await?;
     let row = conn.query_one(&stmt, &[]).await?;
     let v = row.get::<usize, i32>(0);
-    Ok(Response::new(Body::from(format!("Got results {:?}", v))))
+    Ok(Response::new(Body::from(format!("Got results {v:?}"))))
 }

postgres/examples/static_select.rs

@@ -17,7 +17,7 @@ async fn main() {
 
     let pool = match Pool::builder().build(pg_mgr).await {
         Ok(pool) => pool,
-        Err(e) => panic!("builder error: {:?}", e),
+        Err(e) => panic!("builder error: {e:?}"),
     };
 
     let connection = pool.get().await.unwrap();

redis/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.11.0"
 description = "Full-featured async (tokio-based) redis connection pool (like r2d2)"
 license = "MIT"
 repository = "https://github.com/djc/bb8"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 async-trait = "0.1"