Merge branch 'master' into benchs

diesel-rs · Dec 30, 2023 · 7f613c8 · 7f613c8
2 parents 2c3feb8 + fb34be0
commit 7f613c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/diesel_cli/src/infer_schema_internals/foreign_keys.rs b/diesel_cli/src/infer_schema_internals/foreign_keys.rs
@@ -33,7 +33,7 @@ pub fn remove_unsafe_foreign_keys_for_codegen(
                 "Error loading primary keys for `{}`",
                 fk.parent_table
             ));
-            pk_columns.len() == 1 && Some(&pk_columns[0]) == fk.primary_key_columns.get(0)
+            pk_columns.len() == 1 && Some(&pk_columns[0]) == fk.primary_key_columns.first()
         })
         .filter(|fk| !duplicates.contains(&fk.ordered_tables()))
         .cloned()

diff --git a/examples/postgres/advanced-blog-cli/src/pagination.rs b/examples/postgres/advanced-blog-cli/src/pagination.rs
@@ -44,7 +44,7 @@ impl<T> Paginated<T> {
     {
         let per_page = self.per_page;
         let results = self.load::<(U, i64)>(conn)?;
-        let total = results.get(0).map(|x| x.1).unwrap_or(0);
+        let total = results.first().map(|x| x.1).unwrap_or(0);
         let records = results.into_iter().map(|x| x.0).collect();
         let total_pages = (total as f64 / per_page as f64).ceil() as i64;
         Ok((records, total_pages))

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.74.0
+1.75.0