Merge branch 'main' of https://github.com/embassy-rs/embassy into xspi

2 files changed, 2 insertions, 2 deletions

diff --git a/embassy-time-queue-utils/Cargo.toml b/embassy-time-queue-utils/Cargo.toml
index 13da62874..8da30c544 100644
--- a/embassy-time-queue-utils/Cargo.toml
+++ b/embassy-time-queue-utils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "embassy-time-queue-utils"
 version = "0.3.0"
-edition = "2021"
+edition = "2024"
 description = "Timer queue driver trait for embassy-time"
 repository = "https://github.com/embassy-rs/embassy"
 documentation = "https://docs.embassy.dev/embassy-time-queue-utils"
diff --git a/embassy-time-queue-utils/src/queue_generic.rs b/embassy-time-queue-utils/src/queue_generic.rs
index bff7a4735..88986953d 100644
--- a/embassy-time-queue-utils/src/queue_generic.rs
+++ b/embassy-time-queue-utils/src/queue_generic.rs
@@ -2,7 +2,7 @@
 //!
 //! Time queue drivers may use this to simplify their implementation.
 
-use core::cmp::{min, Ordering};
+use core::cmp::{Ordering, min};
 use core::task::Waker;
 
 use heapless::Vec;