mirror of
https://github.com/kristoferssolo/des-rs.git
synced 2026-02-25 04:58:17 +00:00
feat: auto impl From and TryFrom
This commit is contained in:
@@ -1,29 +1,5 @@
|
||||
use std::fmt::{Debug, Display};
|
||||
use bit_wrap::BitWrapper;
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||
#[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Hash, BitWrapper)]
|
||||
#[bit_width(64)]
|
||||
pub struct Key(u64);
|
||||
|
||||
impl Key {
|
||||
// #[macro_use]
|
||||
// pub fn new(key: u64) -> Self {
|
||||
// key.into()
|
||||
// }
|
||||
}
|
||||
|
||||
impl From<u64> for Key {
|
||||
fn from(key: u64) -> Self {
|
||||
Self(key)
|
||||
}
|
||||
}
|
||||
|
||||
impl Debug for Key {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "Key(0x{:016X})", self.0)
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for Key {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "0x{:016X}", self.0)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,31 +3,3 @@ use bit_wrap::BitWrapper;
|
||||
#[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Hash, BitWrapper)]
|
||||
#[bit_width(48)]
|
||||
pub struct Subkey(u64);
|
||||
|
||||
// impl TryFrom<u64> for Subkey {
|
||||
// type Error = SubkeyError;
|
||||
// fn try_from(key: u64) -> Result<Self, Self::Error> {
|
||||
// if key > Self::MAX {
|
||||
// return Err(SubkeyError::ValueOutOfRange(key));
|
||||
// }
|
||||
// Ok(Self(key))
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// impl From<u32> for Subkey {
|
||||
// fn from(value: u32) -> Self {
|
||||
// Self(u64::from(value))
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// impl From<u16> for Subkey {
|
||||
// fn from(value: u16) -> Self {
|
||||
// Self(u64::from(value))
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// impl From<u8> for Subkey {
|
||||
// fn from(value: u8) -> Self {
|
||||
// Self(u64::from(value))
|
||||
// }
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user