mgm: upgrade to Rust 2024 edition; MSRV 1.85 (#753)

tarcieri · web-flow · commit 019db967d342 · 2025-12-26T09:57:34.000-07:00
This will eventually let us add the crate back to the workspace, where
the rest of the crates are 2024 edition.
diff --git a/.github/workflows/mgm.yml b/.github/workflows/mgm.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -46,7 +46,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v6
diff --git a/mgm/Cargo.lock b/mgm/Cargo.lock
diff --git a/mgm/Cargo.toml b/mgm/Cargo.toml
@@ -5,15 +5,15 @@ name = "mgm"
 version = "0.5.0-pre.1"
 description = "Generic implementation of the Multilinear Galois Mode (MGM) cipher"
 authors = ["RustCrypto Developers"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0 OR MIT"
 readme = "README.md"
 documentation = "https://docs.rs/mgm"
 homepage = "https://github.com/RustCrypto/AEADs/tree/master/mgm"
 repository = "https://github.com/RustCrypto/AEADs"
 categories = ["cryptography", "no-std"]
 keywords = ["encryption", "aead"]
-rust-version = "1.81"
+rust-version = "1.85"
 
 [dependencies]
 aead = { version = "0.5", default-features = false }
@@ -28,15 +28,15 @@ cpufeatures = "0.2"
 aead = { version = "0.5", features = ["dev"], default-features = false }
 kuznyechik = "0.7"
 magma = "0.7"
-hex-literal = "0.2"
+hex-literal = "1"
 
 [features]
 default = ["alloc", "getrandom"]
 std = ["aead/std", "alloc"]
 alloc = ["aead/alloc"]
 arrayvec = ["aead/arrayvec"]
 bytes = ["aead/bytes"]
-getrandom  = ["aead/getrandom", "rand_core"]
+getrandom = ["aead/getrandom", "rand_core"]
 rand_core = ["aead/rand_core"]
 stream = ["aead/stream"]
 force-soft = [] # Disable support for hardware intrinsics
diff --git a/mgm/README.md b/mgm/README.md
@@ -2,10 +2,10 @@
 
 [![crate][crate-image]][crate-link]
 [![Docs][docs-image]][docs-link]
+[![Build Status][build-image]][build-link]
 ![Apache2/MIT licensed][license-image]
 ![Rust Version][rustc-image]
 [![Project Chat][chat-image]][chat-link]
-[![Build Status][build-image]][build-link]
 
 Pure Rust implementation of the Multilinear Galois Mode ([MGM]): an
 Authenticated Encryption with Associated Data ([AEAD]) algorithm generic over
@@ -40,12 +40,12 @@ dual licensed as above, without any additional terms or conditions.
 [crate-link]: https://crates.io/crates/mgm
 [docs-image]: https://docs.rs/mgm/badge.svg
 [docs-link]: https://docs.rs/mgm
+[build-image]: https://github.com/RustCrypto/AEADs/actions/workflows/mgm.yml/badge.svg
+[build-link]: https://github.com/RustCrypto/AEADs/actions/workflows/mgm.yml
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.85+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260038-AEADs
-[build-image]: https://github.com/RustCrypto/AEADs/workflows/mgm/badge.svg?branch=master&event=push
-[build-link]: https://github.com/RustCrypto/AEADs/actions
 
 [//]: # (general links)
 
diff --git a/mgm/benches/mod.rs b/mgm/benches/mod.rs
@@ -1,7 +1,7 @@
 #![feature(test)]
 extern crate test;
 
-use aead::{generic_array::GenericArray, AeadInPlace, KeyInit};
+use aead::{AeadInPlace, KeyInit, generic_array::GenericArray};
 use hex_literal::hex;
 use kuznyechik::Kuznyechik;
 use mgm::Mgm;
diff --git a/mgm/src/encdec.rs b/mgm/src/encdec.rs
@@ -1,14 +1,14 @@
 use crate::{
+    DecArgs, EncArgs, MgmBlockSize,
     gf::GfElement,
     sealed::{Counter, Sealed},
-    DecArgs, EncArgs, MgmBlockSize,
 };
 use aead::{
+    Error,
     generic_array::{
-        typenum::{Unsigned, U16, U8},
         GenericArray,
+        typenum::{U8, U16, Unsigned},
     },
-    Error,
 };
 use cipher::{Block, BlockEncrypt, ParBlocks};
 use subtle::ConstantTimeEq;
diff --git a/mgm/src/gf/gf128_soft64.rs b/mgm/src/gf/gf128_soft64.rs
@@ -1,4 +1,4 @@
-use super::{utils::bmul64, GfElement};
+use super::{GfElement, utils::bmul64};
 use aead::{consts::U16, generic_array::GenericArray};
 
 pub struct Element(u64, u64);
diff --git a/mgm/src/gf/gf64_soft64.rs b/mgm/src/gf/gf64_soft64.rs
@@ -1,4 +1,4 @@
-use super::{utils::bmul64, GfElement};
+use super::{GfElement, utils::bmul64};
 use aead::{consts::U8, generic_array::GenericArray};
 
 pub struct Element(u64);
diff --git a/mgm/src/lib.rs b/mgm/src/lib.rs
@@ -30,8 +30,8 @@
 //! ```
 
 use aead::{
-    consts::U0, generic_array::GenericArray, AeadCore, AeadInPlace, Error, Key, KeyInit,
-    KeySizeUser,
+    AeadCore, AeadInPlace, Error, Key, KeyInit, KeySizeUser, consts::U0,
+    generic_array::GenericArray,
 };
 use cfg_if::cfg_if;
 use cipher::{BlockCipher, BlockEncrypt, NewBlockCipher};
diff --git a/mgm/src/sealed.rs b/mgm/src/sealed.rs
@@ -1,9 +1,9 @@
 use aead::{
+    Error,
     generic_array::{
-        typenum::{U16, U8},
         ArrayLength, GenericArray,
+        typenum::{U8, U16},
     },
-    Error,
 };
 use cipher::BlockCipher;
 
diff --git a/mgm/tests/bad_nonce.rs b/mgm/tests/bad_nonce.rs
@@ -2,7 +2,7 @@
 
 #![cfg(feature = "alloc")]
 
-use aead::{generic_array::GenericArray, Aead, KeyInit};
+use aead::{Aead, KeyInit, generic_array::GenericArray};
 use mgm::Mgm;
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use super::{utils::bmul64, GfElement};`
	`1`	`+use super::{GfElement, utils::bmul64};`
`2`	`2`	`use aead::{consts::U16, generic_array::GenericArray};`
`3`	`3`
`4`	`4`	`pub struct Element(u64, u64);`