From 3c8f396f21dc75f733ef5eefe99afd0e9e798f40 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Tue, 17 Dec 2019 09:12:20 +0000
Subject: Remove label from assert_maximum_size macro

Since static_assertions 1.0.0, we no longer have to specify a label when
calling an assert macro.  Therefore we can also remove the label from
our own assert macro assert_maximum_size.
---
 src/commands.rs | 6 +++---
 src/util.rs     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/commands.rs b/src/commands.rs
index 66851c1..0b4e00f 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -34,7 +34,7 @@ struct GetStatusResponse {
     config_delete_user_password: u8,
 }
 
-assert_maximum_size!(GetStatusResponse; GetStatusResponse, crate::device::RESPONSE_DATA_LEN);
+assert_maximum_size!(GetStatusResponse, crate::device::RESPONSE_DATA_LEN);
 
 #[derive(Debug, Default)]
 struct GetStatusCommand {}
@@ -55,14 +55,14 @@ struct ReadSlotNameRequest {
     internal_slot_number: u8,
 }
 
-assert_maximum_size!(ReadSlotNameRequest; ReadSlotNameRequest, crate::device::REQUEST_DATA_LEN);
+assert_maximum_size!(ReadSlotNameRequest, crate::device::REQUEST_DATA_LEN);
 
 #[derive(Debug, Default, Serialize)]
 struct ReadSlotNameResponse {
     slot_name: [u8; 15],
 }
 
-assert_maximum_size!(ReadSlotNameResponse; ReadSlotNameResponse, crate::device::RESPONSE_DATA_LEN);
+assert_maximum_size!(ReadSlotNameResponse, crate::device::RESPONSE_DATA_LEN);
 
 #[derive(Debug, Default)]
 struct ReadSlotNameCommand {}
diff --git a/src/util.rs b/src/util.rs
index 4539bd6..61bcfe7 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -78,7 +78,7 @@ macro_rules! enum_u8 {
 }
 
 macro_rules! assert_maximum_size {
-    ($i:ident; $t:ident, $e: expr) => {
+    ($t:ident, $e: expr) => {
         ::static_assertions::const_assert!(
             ::core::mem::size_of::<$t>() <= $e
         );
-- 
cgit v1.2.3