Reenable clippy and rustfmt in CI

Author: sfackler

.circleci/config.yml

@@ -28,14 +28,14 @@ jobs:
       - image: sfackler/rust-postgres-test:5
     steps:
       - checkout
-#      - run: rustup component add rustfmt clippy
+      - run: rustup component add rustfmt clippy
       - *RESTORE_REGISTRY
       - run: cargo generate-lockfile
       - *SAVE_REGISTRY
       - run: rustc --version > ~/rust-version
       - *RESTORE_DEPS
-#      - run: cargo fmt --all -- --check
-#      - run: cargo clippy --all --all-targets --all-features
+      - run: cargo fmt --all -- --check
+      - run: cargo clippy --all --all-targets --all-features
       - run: cargo test --all
       - run: cargo test --manifest-path tokio-postgres/Cargo.toml --no-default-features
       - run: cargo test --manifest-path tokio-postgres/Cargo.toml --all-features

postgres/src/config.rs

@@ -17,6 +17,8 @@ pub use tokio_postgres::config::{ChannelBinding, SslMode, TargetSessionAttrs};
 use tokio_postgres::tls::{MakeTlsConnect, TlsConnect};
 use tokio_postgres::{Error, Socket};
 
+type Spawn = dyn Fn(Pin<Box<dyn Future<Output = ()> + Send>>) + Sync + Send;
+
 /// Connection configuration.
 ///
 /// Configuration can be parsed from libpq-style connection strings. These strings come in two formats:
@@ -93,7 +95,7 @@ use tokio_postgres::{Error, Socket};
 #[derive(Clone)]
 pub struct Config {
     config: tokio_postgres::Config,
-    spawner: Option<Arc<dyn Fn(Pin<Box<dyn Future<Output = ()> + Send>>) + Sync + Send>>,
+    spawner: Option<Arc<Spawn>>,
 }
 
 impl fmt::Debug for Config {