renames for core pdu

Signed-off-by: Jason Volk <jason@zemos.net>
2024-11-07 03:30:47 +00:00
parent e507c31306
commit 79c6b51860
12 changed files with 123 additions and 89 deletions
@@ -1,4 +1,4 @@
-use super::{PduCount, RawPduId};
+use super::{Count, RawId};
 use crate::utils::u64_from_u8x8;

 pub type ShortRoomId = ShortId;
@@ -6,17 +6,17 @@ pub type ShortEventId = ShortId;
 pub type ShortId = u64;

 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub struct PduId {
+pub struct Id {
 	pub shortroomid: ShortRoomId,
-	pub shorteventid: PduCount,
+	pub shorteventid: Count,
 }

-impl From<RawPduId> for PduId {
+impl From<RawId> for Id {
 	#[inline]
-	fn from(raw: RawPduId) -> Self {
+	fn from(raw: RawId) -> Self {
 		Self {
 			shortroomid: u64_from_u8x8(raw.shortroomid()),
-			shorteventid: PduCount::from_unsigned(u64_from_u8x8(raw.shorteventid())),
+			shorteventid: Count::from_unsigned(u64_from_u8x8(raw.shorteventid())),
 		}
 	}
 }