Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ cc = "1"
liblzma = { version = "0.4", features = ["static"] }
tar = {version = "0.4", default-features = false }
clap = { version = "4", features = [ "derive" ] }
serde = { version = "1", features = ["derive"] }

[workspace.lints.rust]
# Lint groups
Expand Down
3 changes: 2 additions & 1 deletion luomu-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ repository.workspace = true
default = []

[dependencies]
libc = { version = "0.2", optional = true }
libc = { workspace = true, optional = true }
serde = { workspace = true, optional = true }

[dev-dependencies]
quickcheck.workspace = true
Expand Down
24 changes: 24 additions & 0 deletions luomu-common/src/macaddr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ use std::fmt;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
use std::str::FromStr;

#[cfg(feature = "serde")]
use serde::{Deserialize, Deserializer, Serialize, de};

use crate::{InvalidAddress, TagError};

/// The MAC address portion of u64
Expand Down Expand Up @@ -289,6 +292,27 @@ impl fmt::Debug for MacAddr {
}
}

#[cfg(feature = "serde")]
impl Serialize for MacAddr {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: ::serde::Serializer,
{
serializer.serialize_str(&self.to_string())
}
}

#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for MacAddr {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
let s: &str = de::Deserialize::deserialize(deserializer)?;
Ok(Self(FromStr::from_str(s).map_err(de::Error::custom)?))
}
}

#[cfg(test)]
mod tests {
use std::{
Expand Down
Loading