pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-05-10 07:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Serialize and deserialize CString through [u8]

Browse Source
This commit is contained in:
Jon Gjengset
2017-03-03 18:05:08 -05:00
parent be09fc9bbb
commit 0d6d077e6a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/de/impls.rs
+4 -2
View File
@@ -26,7 +26,7 @@ use std::net;
use std::path; use std::path;
use core::str; use core::str;
#[cfg(feature = "std")] #[cfg(feature = "std")]
use std::ffi::{CStr, CString}; use std::ffi::CString;
#[cfg(feature = "std")] #[cfg(feature = "std")]
use std::rc::Rc; use std::rc::Rc;
@@ -55,6 +55,8 @@ use de::{Deserialize, Deserializer, EnumVisitor, Error, MapVisitor, SeqVisitor,
VariantVisitor, Visitor}; VariantVisitor, Visitor};
use de::from_primitive::FromPrimitive; use de::from_primitive::FromPrimitive;
use super::super::bytes::ByteBuf;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// A visitor that produces a `()`. /// A visitor that produces a `()`.
@@ -302,7 +304,7 @@ impl Deserialize for CString {
fn deserialize<D>(deserializer: D) -> Result<CString, D::Error> fn deserialize<D>(deserializer: D) -> Result<CString, D::Error>
where D: Deserializer where D: Deserializer
{ {
let v: Vec<u8> = try!(Deserialize::deserialize(deserializer)); let v: Vec<u8> = try!(ByteBuf::deserialize(deserializer)).into();
CString::new(v) CString::new(v)
.map_err(|e| Error::custom(format!("unexpected NULL at byte {}", e.nul_position()))) .map_err(|e| Error::custom(format!("unexpected NULL at byte {}", e.nul_position())))
} }