Merge branch 'main' into crate_codegen

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "examples/*",
     "test_integration",

benches/generated/Cargo.toml

@@ -30,4 +30,4 @@ futures = "0.3.28"
 
 ## Async features dependencies
 # Async connection pooling
-deadpool-postgres = { version = "0.10.5", optional = true }
+deadpool-postgres = { version = "0.11.0", optional = true }

benches/generated/src/array_iterator.rs

@@ -47,7 +47,7 @@ impl<'a, T: FromSql<'a>> FromSql<'a> for ArrayIterator<'a, T> {
         Ok(ArrayIterator {
             ty: member_type.clone(),
             values: array.values(),
-            _type: PhantomData::default(),
+            _type: PhantomData,
         })
     }
     fn accepts(ty: &Type) -> bool {

crates/cornucopia/Cargo.toml

@@ -33,7 +33,7 @@ clap = { version = "4.3.5", features = ["derive"] }
 heck = "0.4.1"
 
 # Order-preserving map to work around borrowing issues
-indexmap = "2.0.0"
+indexmap = "2.0.2"
 
 # Generate temporary files
-tempfile = "3.6.0"
+tempfile = "3.6.0"

crates/cornucopia/src/codegen/cargo.rs

@@ -147,7 +147,7 @@ pub fn gen_cargo_file(
 
             ## Async features dependencies
             # Async connection pooling
-            deadpool-postgres = {{ version = "0.10.5", optional = true }}
+            deadpool-postgres = {{ version = "0.11.0", optional = true }}
         "#}
         .unwrap();
     }

crates/cornucopia/src/codegen/client.rs

@@ -273,7 +273,7 @@ pub fn core_array() -> String {
                 Ok(ArrayIterator {
                     ty: member_type.clone(),
                     values: array.values(),
-                    _type: PhantomData::default(),
+                    _type: PhantomData,
                 })
             }
 

crates/cornucopia/src/parser.rs

@@ -224,7 +224,8 @@ impl Query {
                     .iter()
                     .enumerate()
                     .rev()
-                    .filter_map(|(i, u)| (!bind_params[..i].contains(u)).then(|| u.clone()))
+                    .filter(|(i, u)| !bind_params[..*i].contains(u))
+                    .map(|(_, u)| u.clone())
                     .rev()
                     .collect();
 

examples/auto_build/Cargo.toml

@@ -12,4 +12,4 @@ futures = "0.3.28"
 # Postgres interaction
 tokio-postgres = "0.7.8"
 # Connection pooling
-deadpool-postgres = "0.10.5"
+deadpool-postgres = "0.11.0"

examples/auto_build/auto_build_codegen/Cargo.toml

@@ -26,4 +26,4 @@ futures = "0.3.28"
 
 ## Async features dependencies
 # Async connection pooling
-deadpool-postgres = { version = "0.10.5", optional = true }
+deadpool-postgres = { version = "0.11.0", optional = true }

examples/auto_build/auto_build_codegen/src/array_iterator.rs

@@ -47,7 +47,7 @@ impl<'a, T: FromSql<'a>> FromSql<'a> for ArrayIterator<'a, T> {
         Ok(ArrayIterator {
             ty: member_type.clone(),
             values: array.values(),
-            _type: PhantomData::default(),
+            _type: PhantomData,
         })
     }
     fn accepts(ty: &Type) -> bool {

examples/basic_async/Cargo.toml

@@ -10,6 +10,6 @@ codegen = { path = "basic_async_codegen", package = "basic_async_codegen" }
 tokio = { version = "1.28.1", features = ["macros", "rt-multi-thread"] }
 futures = "0.3.28"
 # Postgres interaction
-tokio-postgres = "0.7.8"
-# Connection pooling
-deadpool-postgres = "0.10.5"
+tokio-postgres = "0.7.7"
+## Connection pooling
+deadpool-postgres = "0.11.0"

examples/basic_async/basic_async_codegen/Cargo.toml

@@ -26,4 +26,4 @@ futures = "0.3.28"
 
 ## Async features dependencies
 # Async connection pooling
-deadpool-postgres = { version = "0.10.5", optional = true }
+deadpool-postgres = { version = "0.11.0", optional = true }

examples/basic_async/basic_async_codegen/src/array_iterator.rs

@@ -47,7 +47,7 @@ impl<'a, T: FromSql<'a>> FromSql<'a> for ArrayIterator<'a, T> {
         Ok(ArrayIterator {
             ty: member_type.clone(),
             values: array.values(),
-            _type: PhantomData::default(),
+            _type: PhantomData,
         })
     }
     fn accepts(ty: &Type) -> bool {

examples/basic_sync/basic_sync_codegen/src/array_iterator.rs

@@ -47,7 +47,7 @@ impl<'a, T: FromSql<'a>> FromSql<'a> for ArrayIterator<'a, T> {
         Ok(ArrayIterator {
             ty: member_type.clone(),
             values: array.values(),
-            _type: PhantomData::default(),
+            _type: PhantomData,
         })
     }
     fn accepts(ty: &Type) -> bool {

test_codegen/codegen/Cargo.toml

@@ -43,4 +43,4 @@ futures = "0.3.28"
 
 ## Async features dependencies
 # Async connection pooling
-deadpool-postgres = { version = "0.10.5", optional = true }
+deadpool-postgres = { version = "0.11.0", optional = true }

test_codegen/codegen/src/array_iterator.rs

@@ -47,7 +47,7 @@ impl<'a, T: FromSql<'a>> FromSql<'a> for ArrayIterator<'a, T> {
         Ok(ArrayIterator {
             ty: member_type.clone(),
             values: array.values(),
-            _type: PhantomData::default(),
+            _type: PhantomData,
         })
     }
     fn accepts(ty: &Type) -> bool {

test_codegen/src/main.rs

@@ -129,8 +129,7 @@ pub fn test_trait_sql(client: &mut Client) {
         .unwrap();
     find_books().bind(client, &vec![cow]).all().unwrap();
 
-    let map: HashMap<&str, &str> =
-        HashMap::from_iter([("one", "1"), ("two", "2"), ("three", "3")].into_iter());
+    let map: HashMap<&str, &str> = HashMap::from_iter([("one", "1"), ("two", "2"), ("three", "3")]);
 
     // Old way with allocation
     let vec: Vec<_> = map.values().collect();
@@ -297,7 +296,7 @@ pub fn test_named(client: &mut Client) {
 }
 
 // Test we correctly implement borrowed version and copy derive
-#[allow(clippy::drop_copy)]
+#[allow(dropping_copy_types)]
 pub fn test_copy(client: &mut Client) {
     // Test copy
     let copy_params = CopyComposite {

test_integration/Cargo.toml

@@ -28,4 +28,4 @@ postgres = "0.19.5"
 ## Test fixtures ser/de
 serde = { version = "1.0.163", features = ["derive"] }
 ## Read/write fixture files
-toml = "0.7.3"
+toml = "0.8.2"