diff --git a/.rustfmt.toml b/.rustfmt.toml
index 6455f16cd..0526e11b5 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -7,4 +7,4 @@ group_imports = "StdExternalCrate"
 format_code_in_doc_comments = true
 doc_comment_code_block_width = 80
 # Workaround for https://github.com/rust-lang/rust.vim/issues/464
-edition = "2021"
+edition = "2024"
diff --git a/crates/matrix-sdk-qrcode/Cargo.toml b/crates/matrix-sdk-qrcode/Cargo.toml
index 8ae19ecb1..2742b2950 100644
--- a/crates/matrix-sdk-qrcode/Cargo.toml
+++ b/crates/matrix-sdk-qrcode/Cargo.toml
@@ -3,7 +3,7 @@ name = "matrix-sdk-qrcode"
 description = "Library to encode and decode QR codes for interactive verifications in Matrix land"
 version = "0.16.0"
 authors = ["Damir Jelić <poljar@termina.org.uk>"]
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ruma", "nio"]
 license = "Apache-2.0"
diff --git a/crates/matrix-sdk-qrcode/src/types.rs b/crates/matrix-sdk-qrcode/src/types.rs
index da480b318..b42de9ffe 100644
--- a/crates/matrix-sdk-qrcode/src/types.rs
+++ b/crates/matrix-sdk-qrcode/src/types.rs
@@ -21,7 +21,7 @@ use vodozemac::Ed25519PublicKey;
 
 use crate::{
     error::{DecodingError, EncodingError},
-    utils::{to_bytes, to_qr_code, HEADER, MAX_MODE, MIN_SECRET_LEN, VERSION},
+    utils::{HEADER, MAX_MODE, MIN_SECRET_LEN, VERSION, to_bytes, to_qr_code},
 };
 
 /// An enum representing the different modes for a QR verification code.
diff --git a/crates/matrix-sdk-qrcode/src/utils.rs b/crates/matrix-sdk-qrcode/src/utils.rs
index 9614daa1b..38d2a6b30 100644
--- a/crates/matrix-sdk-qrcode/src/utils.rs
+++ b/crates/matrix-sdk-qrcode/src/utils.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use qrcode::{bits::Bits, EcLevel, QrCode, Version};
+use qrcode::{EcLevel, QrCode, Version, bits::Bits};
 use ruma::serde::Base64;
 use vodozemac::Ed25519PublicKey;