Migrate to Rust 2024 edition

Changes made are purely due to formatting changes in rustfmt 2024
FlixCoder · Feb 20, 2025 · 080f287 · 080f287
1 parent 93cd778
commit 080f287
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 38 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Flix <[email protected]>"]
 categories = ["asynchronous", "concurrency", "database"]
 description = "Message/job queue based on bonsaidb, similar to sqlxmq."
 documentation = "https://docs.rs/bonsaimq"
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/FlixCoder/bonsaimq"
 keywords = ["message", "job", "queue", "database", "persistent"]
 license = "MIT"

diff --git a/examples/checkpoints.rs b/examples/checkpoints.rs
@@ -10,10 +10,10 @@
 mod common;
 
 use bonsaidb::local::{
-	config::{Builder, StorageConfiguration},
 	AsyncDatabase,
+	config::{Builder, StorageConfiguration},
 };
-use bonsaimq::{job_registry, CurrentJob, JobRegister, JobRunner, MessageQueueSchema};
+use bonsaimq::{CurrentJob, JobRegister, JobRunner, MessageQueueSchema, job_registry};
 use color_eyre::Result;
 
 /// Example job function using checkpoints.

diff --git a/examples/context.rs b/examples/context.rs
@@ -10,11 +10,11 @@
 mod common;
 
 use bonsaidb::local::{
-	config::{Builder, StorageConfiguration},
 	AsyncDatabase,
+	config::{Builder, StorageConfiguration},
 };
-use bonsaimq::{job_registry, CurrentJob, JobRegister, JobRunner, MessageQueueSchema};
-use color_eyre::{eyre::eyre, Result};
+use bonsaimq::{CurrentJob, JobRegister, JobRunner, MessageQueueSchema, job_registry};
+use color_eyre::{Result, eyre::eyre};
 
 /// Example job function using context. It receives a handle to the current job,
 /// which gives the ability to get the context.

diff --git a/examples/error_handling.rs b/examples/error_handling.rs
@@ -10,16 +10,16 @@
 mod common;
 
 use std::sync::{
-	atomic::{AtomicBool, Ordering},
 	Arc,
+	atomic::{AtomicBool, Ordering},
 };
 
 use bonsaidb::local::{
-	config::{Builder, StorageConfiguration},
 	AsyncDatabase,
+	config::{Builder, StorageConfiguration},
 };
-use bonsaimq::{job_registry, CurrentJob, JobRegister, JobRunner, MessageQueueSchema};
-use color_eyre::{eyre::bail, Result};
+use bonsaimq::{CurrentJob, JobRegister, JobRunner, MessageQueueSchema, job_registry};
+use color_eyre::{Result, eyre::bail};
 
 /// Example job function that returns an error.
 async fn greet(mut job: CurrentJob) -> Result<()> {

diff --git a/examples/simple.rs b/examples/simple.rs
@@ -10,10 +10,10 @@
 mod common;
 
 use bonsaidb::local::{
-	config::{Builder, StorageConfiguration},
 	AsyncDatabase,
+	config::{Builder, StorageConfiguration},
 };
-use bonsaimq::{job_registry, CurrentJob, JobRegister, JobRunner, MessageQueueSchema};
+use bonsaimq::{CurrentJob, JobRegister, JobRunner, MessageQueueSchema, job_registry};
 use color_eyre::Result;
 
 /// Example job function. It receives a handle to the current job, which gives

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,4 +1,4 @@
-edition = "2021"
+edition = "2024"
 hard_tabs = true
 group_imports = "StdExternalCrate"
 imports_granularity = "Crate"

diff --git a/src/error.rs b/src/error.rs
@@ -2,7 +2,7 @@
 
 use std::num::TryFromIntError;
 
-use bonsaidb::core::{pubsub, Error as BonsaiError};
+use bonsaidb::core::{Error as BonsaiError, pubsub};
 use thiserror::Error;
 
 /// This crate's main error type.

diff --git a/src/job.rs b/src/job.rs
@@ -1,16 +1,16 @@
 //! Provider for job handlers.
 
 use std::sync::{
-	atomic::{AtomicUsize, Ordering},
 	Arc,
+	atomic::{AtomicUsize, Ordering},
 };
 
-use serde::{de::DeserializeOwned, Serialize};
+use serde::{Serialize, de::DeserializeOwned};
 use tokio::task::JoinHandle;
-use tokio_retry::{strategy::FixedInterval, RetryIf};
+use tokio_retry::{RetryIf, strategy::FixedInterval};
 use tracing_futures::Instrument;
 
-use crate::{queue::Id, runner::JobRunnerHandle, AbortOnDropHandle, Error, JobFunctionType};
+use crate::{AbortOnDropHandle, Error, JobFunctionType, queue::Id, runner::JobRunnerHandle};
 
 /// Handle to the `JobRunner`.
 type JobRunnerHandler = Arc<dyn JobRunnerHandle + Send + Sync>;

diff --git a/src/queue.rs b/src/queue.rs
@@ -5,9 +5,9 @@ use std::time::Duration;
 use bonsaidb::core::{
 	document::{CollectionDocument, Emit},
 	schema::{
-		view::{map::Mappings, ViewUpdatePolicy},
 		Collection, CollectionMapReduce, ReduceResult, Schema, View, ViewMapResult,
 		ViewMappedValue, ViewSchema,
+		view::{ViewUpdatePolicy, map::Mappings},
 	},
 };
 use serde::{Deserialize, Serialize};
@@ -178,11 +178,7 @@ impl RetryTiming {
 				let duration =
 					initial.saturating_mul(2_u32.saturating_pow(executions.saturating_sub(1)));
 
-				if let Some(max) = maximum {
-					duration.min(max)
-				} else {
-					duration
-				}
+				if let Some(max) = maximum { duration.min(max) } else { duration }
 			}
 		}
 	}

diff --git a/src/registry.rs b/src/registry.rs
@@ -4,7 +4,7 @@
 
 use std::{error::Error, future::Future, pin::Pin};
 
-use crate::{spawn::JobBuilder, CurrentJob};
+use crate::{CurrentJob, spawn::JobBuilder};
 
 /// Function type of the jobs returned by the job registry.
 pub type JobFunctionType = Box<

diff --git a/src/runner.rs b/src/runner.rs
@@ -5,27 +5,27 @@ use std::{
 	fmt::Debug,
 	ops::Range,
 	sync::{
-		atomic::{AtomicUsize, Ordering},
 		Arc,
+		atomic::{AtomicUsize, Ordering},
 	},
 	thread::available_parallelism,
 	time::Duration,
 };
 
 use bonsaidb::core::{
+	Error as BonsaiError,
 	async_trait::async_trait,
 	connection::AsyncConnection,
 	document::CollectionDocument,
 	pubsub::{AsyncPubSub, AsyncSubscriber},
-	schema::{view::map::MappedDocuments, Collection, SerializedCollection},
+	schema::{Collection, SerializedCollection, view::map::MappedDocuments},
 	transaction::{Operation, Transaction},
-	Error as BonsaiError,
 };
 use time::OffsetDateTime;
 
 use crate::{
-	queue::{DueMessages, Id, Message, MessagePayload, Timestamp, MQ_NOTIFY},
 	AbortOnDropHandle, CurrentJob, Error, JobRegister,
+	queue::{DueMessages, Id, MQ_NOTIFY, Message, MessagePayload, Timestamp},
 };
 
 /// Error handler dynamic function type.

diff --git a/src/spawn.rs b/src/spawn.rs
@@ -11,10 +11,10 @@ use serde::Serialize;
 use time::OffsetDateTime;
 
 use crate::{
+	Error,
 	queue::{
-		generate_id, Id, LatestMessage, Message, MessagePayload, RetryTiming, Timestamp, MQ_NOTIFY,
+		Id, LatestMessage, MQ_NOTIFY, Message, MessagePayload, RetryTiming, Timestamp, generate_id,
 	},
-	Error,
 };
 
 /// Builder for spawning a job.  By default, `ordered` mode is off and infinite

diff --git a/src/users.rs b/src/users.rs
@@ -5,8 +5,8 @@ use std::time::Duration;
 use bonsaidb::core::{connection::AsyncConnection, schema::SerializedCollection};
 
 use crate::{
-	queue::{Id, Message},
 	Error,
+	queue::{Id, Message},
 };
 
 /// Check whether the job with the given ID exists. Can also be used to check if

diff --git a/tests/general.rs b/tests/general.rs
@@ -9,10 +9,10 @@ use std::{
 };
 
 use bonsaidb::local::{
-	config::{Builder, StorageConfiguration},
 	AsyncDatabase,
+	config::{Builder, StorageConfiguration},
 };
-use bonsaimq::{job_registry, CurrentJob, JobRegister, JobRunner, MessageQueueSchema};
+use bonsaimq::{CurrentJob, JobRegister, JobRunner, MessageQueueSchema, job_registry};
 use color_eyre::Result;
 
 /// Counter

diff --git a/tests/ordering.rs b/tests/ordering.rs
@@ -6,10 +6,10 @@ mod common;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 use bonsaidb::local::{
-	config::{Builder, StorageConfiguration},
 	AsyncDatabase,
+	config::{Builder, StorageConfiguration},
 };
-use bonsaimq::{job_registry, CurrentJob, JobRegister, JobRunner, MessageQueueSchema};
+use bonsaimq::{CurrentJob, JobRegister, JobRunner, MessageQueueSchema, job_registry};
 use color_eyre::Result;
 
 /// Counter

diff --git a/tests/stress.rs b/tests/stress.rs
@@ -9,10 +9,10 @@ use std::{
 };
 
 use bonsaidb::local::{
-	config::{Builder, StorageConfiguration},
 	AsyncDatabase,
+	config::{Builder, StorageConfiguration},
 };
-use bonsaimq::{job_registry, CurrentJob, JobRegister, JobRunner, MessageQueueSchema};
+use bonsaimq::{CurrentJob, JobRegister, JobRunner, MessageQueueSchema, job_registry};
 use color_eyre::Result;
 
 /// Counter