upgrade to 2024 edition

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

Author: connortsui20

.github/workflows/check.yml

@@ -115,7 +115,7 @@ jobs:
     # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
     strategy:
       matrix:
-        msrv: ["1.80.0"] # `Lazy` types stabilized in "1.80".
+        msrv: ["1.85.1"] # 2024 Edition.
     name: ubuntu / ${{ matrix.msrv }}
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "async-bpm"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

src/bpm.rs

@@ -10,12 +10,12 @@
 //! pool manager would work.
 
 use crate::{
-    page::{Page, PageHandle, PageId, PAGE_SIZE},
-    storage::{Frame, FrameGroup, StorageManager, FRAME_GROUP_SIZE},
+    page::{PAGE_SIZE, Page, PageHandle, PageId},
+    storage::{FRAME_GROUP_SIZE, Frame, FrameGroup, StorageManager},
 };
 use rand::prelude::*;
 use scc::HashMap;
-use std::sync::{atomic::AtomicBool, Arc, OnceLock};
+use std::sync::{Arc, OnceLock, atomic::AtomicBool};
 use std::{future::Future, io::Result};
 use tokio::sync::RwLock;
 use tokio::task;

src/page/page_handle.rs

@@ -6,14 +6,14 @@
 //! one of the methods on [`PageHandle`].
 
 use crate::bpm::BufferPoolManager;
-use crate::page::page_guard::{ReadPageGuard, WritePageGuard};
 use crate::page::Page;
+use crate::page::page_guard::{ReadPageGuard, WritePageGuard};
 use crate::storage::{Frame, StorageManagerHandle};
 use derivative::Derivative;
 use std::io::Result;
 use std::ops::Deref;
-use std::sync::atomic::Ordering;
 use std::sync::Arc;
+use std::sync::atomic::Ordering;
 use tokio::sync::RwLockWriteGuard;
 use tracing::field::Empty;
 use tracing::{info, instrument, trace, warn};

src/storage/frame.rs

@@ -4,10 +4,10 @@
 //! with the the kernel to avoid unnecessary `memcpy`s from the kernel's internal buffers into
 //! user-space buffers.
 
-use crate::storage::frame_group::{EvictionState, FrameGroup, FRAME_GROUP_SIZE};
+use crate::storage::frame_group::{EvictionState, FRAME_GROUP_SIZE, FrameGroup};
 use crate::{
     bpm::BufferPoolManager,
-    page::{Page, PAGE_SIZE},
+    page::{PAGE_SIZE, Page},
 };
 use std::{
     ops::{Deref, DerefMut},

src/storage/frame_group.rs

@@ -10,8 +10,8 @@ use crate::storage::storage_manager::StorageManager;
 use async_channel::{Receiver, Sender};
 use std::io::Result;
 use std::sync::{
-    atomic::{AtomicUsize, Ordering},
     Arc, Mutex,
+    atomic::{AtomicUsize, Ordering},
 };
 
 /// The number of frames in a [`FrameGroup`].

src/storage/storage_manager.rs

@@ -13,11 +13,11 @@ use crate::{page::PageId, storage::frame::Frame};
 use std::io::Result;
 use std::ops::Deref;
 use std::os::unix::fs::OpenOptionsExt;
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::LazyLock;
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::{rc::Rc, sync::OnceLock};
-use tokio_uring::fs::File;
 use tokio_uring::BufResult;
+use tokio_uring::fs::File;
 
 /// The name of the database's file.
 pub const DATABASE_NAME: &str = "bpm.db";

tests/basic.rs

@@ -1,4 +1,4 @@
-use async_bpm::{page::PageId, BufferPoolManager};
+use async_bpm::{BufferPoolManager, page::PageId};
 use std::ops::DerefMut;
 use std::thread;
 

tests/throughput.rs

@@ -1,16 +1,16 @@
 use async_bpm::{
-    page::{PageId, PAGE_SIZE},
     BufferPoolManager, IO_OPERATIONS,
+    page::{PAGE_SIZE, PageId},
 };
 use core_affinity::CoreId;
 use rand::rng;
-use rand::{distr::Distribution, Rng};
+use rand::{Rng, distr::Distribution};
 use rand_distr::Zipf;
 use std::{
     ops::{Deref, DerefMut},
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
     thread,
 };
@@ -63,7 +63,9 @@ const READ: bool = true;
 fn throughput() {
     tracing_subscriber::fmt::init();
 
-    info!("Find tasks: {FIND_TASKS}, Find Threads: {FIND_THREADS}, Scan Tasks: {SCAN_TASKS}, Scan Threads: {SCAN_THREADS}");
+    info!(
+        "Find tasks: {FIND_TASKS}, Find Threads: {FIND_THREADS}, Scan Tasks: {SCAN_TASKS}, Scan Threads: {SCAN_THREADS}"
+    );
 
     BufferPoolManager::initialize(FRAMES, STORAGE_PAGES);