itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-10-02 07:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deserialize PathBuf from bytes

Browse Source 
&Path already allows this. Also complete the tests for Path/PathBuf.
This commit is contained in:
Jan Alexander Steffens (heftig) 2019-10-22 22:28:21 +02:00
parent cf31418555
commit 42990d8264
No known key found for this signature in database
GPG Key ID: A5E9288C4FA415FA
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
serde/src/de/impls.rs
View File

@ -1580,6 +1580,24 @@ impl<'de> Visitor<'de> for PathBufVisitor {
{ {
Ok(From::from(v)) Ok(From::from(v))
} }
fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
where
E: Error,
{
str::from_utf8(v)
.map(From::from)
.map_err(|_| Error::invalid_value(Unexpected::Bytes(v), &self))
}
fn visit_byte_buf<E>(self, v: Vec<u8>) -> Result<Self::Value, E>
where
E: Error,
{
String::from_utf8(v)
.map(From::from)
.map_err(|e| Error::invalid_value(Unexpected::Bytes(&e.into_bytes()), &self))
}
} }
#[cfg(feature = "std")] #[cfg(feature = "std")]

12
test_suite/tests/test_de.rs
View File

@ -889,11 +889,23 @@ declare_tests! {
Path::new("/usr/local/lib") => &[ Path::new("/usr/local/lib") => &[
Token::BorrowedStr("/usr/local/lib"), Token::BorrowedStr("/usr/local/lib"),
], ],
Path::new("/usr/local/lib") => &[
Token::BorrowedBytes(b"/usr/local/lib"),
],
} }
test_path_buf { test_path_buf {
PathBuf::from("/usr/local/lib") => &[
Token::Str("/usr/local/lib"),
],
PathBuf::from("/usr/local/lib") => &[ PathBuf::from("/usr/local/lib") => &[
Token::String("/usr/local/lib"), Token::String("/usr/local/lib"),
], ],
PathBuf::from("/usr/local/lib") => &[
Token::Bytes(b"/usr/local/lib"),
],
PathBuf::from("/usr/local/lib") => &[
Token::ByteBuf(b"/usr/local/lib"),
],
} }
test_cstring { test_cstring {
CString::new("abc").unwrap() => &[ CString::new("abc").unwrap() => &[