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

Use the existing CString error message

Browse Source
This commit is contained in:
David Tolnay
2017-03-05 13:59:18 -08:00
parent 2f988aa5e6
commit cc06f070d1
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/de/impls.rs
+2 -3
View File
@@ -305,9 +305,8 @@ 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!(ByteBuf::deserialize(deserializer)).into(); let bytes = try!(ByteBuf::deserialize(deserializer));
CString::new(v) CString::new(bytes).map_err(Error::custom)
.map_err(|e| Error::custom(format!("unexpected NULL at byte {}", e.nul_position())))
} }
} }
test_suite/tests/test_de.rs
+2 -2
View File
@@ -1005,12 +1005,12 @@ declare_error_tests! {
&[ &[
Token::Bytes(b"a\0c"), Token::Bytes(b"a\0c"),
], ],
Error::Message("unexpected NULL at byte 1".into()), Error::Message("nul byte found in provided data at position: 1".into()),
} }
test_cstring_internal_null_end<CString> { test_cstring_internal_null_end<CString> {
&[ &[
Token::Bytes(b"ac\0"), Token::Bytes(b"ac\0"),
], ],
Error::Message("unexpected NULL at byte 2".into()), Error::Message("nul byte found in provided data at position: 2".into()),
} }
} }