Small postm3 fixes

benches/merge_benchmarks.rs

@@ -73,7 +73,8 @@ fn benchmark_merge(c: &mut Criterion) {
             b.iter_with_setup(
                 || setup_benchmark_data(size as usize, 5),
                 |(mut page_range, pd)| {
-                    black_box(page_range.merge(pd));
+                    page_range.merge(pd);
+                    black_box(());
                 },
             );
         });
@@ -82,7 +83,8 @@ fn benchmark_merge(c: &mut Criterion) {
             b.iter_with_setup(
                 || setup_benchmark_data(size as usize, 5),
                 |(mut page_range, pd)| {
-                    black_box(page_range.optimized_merge(pd));
+                    page_range.optimized_merge(pd);
+                    black_box(());
                 },
             );
         });
@@ -99,7 +101,8 @@ fn benchmark_column_counts(c: &mut Criterion) {
             b.iter_with_setup(
                 || setup_benchmark_data(100, cols),
                 |(mut page_range, pd)| {
-                    black_box(page_range.merge(pd));
+                    page_range.merge(pd);
+                    black_box(());
                 },
             );
         });
@@ -108,7 +111,8 @@ fn benchmark_column_counts(c: &mut Criterion) {
             b.iter_with_setup(
                 || setup_benchmark_data(100, cols),
                 |(mut page_range, pd)| {
-                    black_box(page_range.optimized_merge(pd));
+                    page_range.optimized_merge(pd);
+                    black_box(());
                 },
             );
         });

benches/page_dir_benchmarks.rs

@@ -5,7 +5,7 @@ use redoxql::table::PageDirectory;
 fn bench_single_write(c: &mut Criterion) {
     c.bench_function("write to page dir once", |b| {
         b.iter_with_setup(
-            || PageDirectory::new(),
+            PageDirectory::new,
             |mut pagedir| {
                 pagedir.directory.insert(black_box(42), Record::default());
             },
@@ -20,7 +20,7 @@ fn bench_many_writes(c: &mut Criterion) {
     for size in sizes.iter() {
         group.bench_with_input(format!("{} writes", size), size, |b, &size| {
             b.iter_with_setup(
-                || PageDirectory::new(),
+                PageDirectory::new,
                 |mut pagedir| {
                     for i in 0..size {
                         pagedir.directory.insert(black_box(i), Record::default());

src/transaction.rs

@@ -25,11 +25,10 @@
  * - Ensure guards are dropped as soon as possible by using separate scopes
  */
 
-use crate::database::RecordId2;
-
 use super::database::{LockType, RecordId};
 use super::query::RQuery;
 use super::table::RTableHandle;
+use crate::database::RecordId2;
 use log::debug;
 use pyo3::prelude::*;
 use std::collections::{HashSet, VecDeque};
@@ -600,7 +599,6 @@ mod tests {
     use super::*;
     use crate::database::RDatabase;
     use std::sync::mpsc;
-    use std::sync::Mutex;
     use std::thread;
     use std::time::{Duration, Instant};
 
@@ -627,7 +625,7 @@ mod tests {
     {
         let (tx, rx) = mpsc::channel();
 
-        let handle = thread::spawn(move || {
+        let _ = thread::spawn(move || {
             let result = test_fn();
             let _ = tx.send(result);
         });

tests/update_tests.rs

@@ -12,7 +12,7 @@ fn thousands_of_updates_test() {
     // Instead of constantly updating primary_key_column, update the second column
     for x in 0..100_000 {
         let res = q.update(0, vec![None, Some(x), None]);
-        assert_eq!(res, true);
+        assert!(res);
     }
 }
 
@@ -31,7 +31,7 @@ fn thousands_of_ops_test() {
 
     for x in 0..100_000 {
         let res = q.update(x, vec![None, Some(x), Some(4)]);
-        assert_eq!(res, true);
+        assert!(res);
     }
 
     for x in 0..100_000 {