Skip to content

fix: allow deserializing BDAddr from non-borrowed strings #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qwandor merged 1 commit into from
Nov 17, 2024
Merged

fix: allow deserializing BDAddr from non-borrowed strings #408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 35 additions & 6 deletions src/api/bdaddr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ impl BDAddr {
/// Different de-/serialization formats for [`BDAddr`].
#[cfg(feature = "serde")]
pub mod serde {
use std::borrow::Cow;
use std::fmt::{self, Write as _};

use serde::{
Expand Down Expand Up @@ -266,11 +267,11 @@ pub mod serde {
D: Deserializer<'de>,
{
let buf = d.deserialize_str(ColonDelimVisitor)?;
BDAddr::from_str_delim(buf).map_err(D::Error::custom)
BDAddr::from_str_delim(&buf).map_err(D::Error::custom)
}

impl<'de> Visitor<'de> for ColonDelimVisitor {
type Value = &'de str;
type Value = Cow<'de, str>;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
write!(
Expand All @@ -279,11 +280,25 @@ pub mod serde {
)
}

fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
where
E: DeError,
{
Ok(v.to_string().into())
}

fn visit_borrowed_str<E>(self, v: &'de str) -> Result<Self::Value, E>
where
E: DeError,
{
Ok(v)
Ok(v.into())
}

fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
where
E: DeError,
{
Ok(v.into())
}
}
}
Expand Down Expand Up @@ -329,11 +344,11 @@ pub mod serde {
D: Deserializer<'de>,
{
let buf = d.deserialize_str(NoDelimVisitor)?;
BDAddr::from_str_no_delim(buf).map_err(D::Error::custom)
BDAddr::from_str_no_delim(&buf).map_err(D::Error::custom)
}

impl<'de> Visitor<'de> for NoDelimVisitor {
type Value = &'de str;
type Value = Cow<'de, str>;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
write!(
Expand All @@ -342,11 +357,25 @@ pub mod serde {
)
}

fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
where
E: DeError,
{
Ok(v.to_string().into())
}

fn visit_borrowed_str<E>(self, v: &'de str) -> Result<Self::Value, E>
where
E: DeError,
{
Ok(v)
Ok(v.into())
}

fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
where
E: DeError,
{
Ok(v.into())
}
}
}
Expand Down
Loading