pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-13 23:01:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Utf16 handling moved from std into unicode crate

Browse Source 
Following a rust change.
This commit is contained in:
Thomas Bahn
2014-12-23 16:44:10 +01:00
parent 0957d5769d
commit 3cf0fb8d5b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/json/de.rs
+3 -3
View File
@@ -1,6 +1,6 @@
use std::str; use std::str;
use std::num::Float; use std::num::Float;
use std::str::ScalarValue; use unicode::str::Utf16Item;
use std::char; use std::char;
use de; use de;
@@ -379,8 +379,8 @@ impl<Iter: Iterator<u8>> Parser<Iter> {
} }
let buf = &[n1, try!(self.decode_hex_escape())]; let buf = &[n1, try!(self.decode_hex_escape())];
match str::utf16_items(buf.as_slice()).next() { match ::unicode::str::utf16_items(buf.as_slice()).next() {
Some(ScalarValue(c)) => c, Some(Utf16Item::ScalarValue(c)) => c,
_ => { _ => {
return Err(self.error(ErrorCode::LoneLeadingSurrogateInHexEscape)); return Err(self.error(ErrorCode::LoneLeadingSurrogateInHexEscape));
} }
src/lib.rs
+2
View File
@@ -12,6 +12,8 @@ extern crate serde_macros;
#[cfg(test)] #[cfg(test)]
extern crate serialize; extern crate serialize;
extern crate unicode;
pub use de::{Deserializer, Deserialize}; pub use de::{Deserializer, Deserialize};
pub use ser::{Serializer, Serialize}; pub use ser::{Serializer, Serialize};