pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-13 09: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 18:35:00 +01:00
parent 17ffa65cb2
commit a276ec4bba
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde2/src/json/de.rs
+3 -3
View File
@@ -1,6 +1,6 @@
use std::char; use std::char;
use std::num::Float; use std::num::Float;
use std::str::ScalarValue; use unicode::str::Utf16Item;
use std::str; use std::str;
use de; use de;
@@ -337,8 +337,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));
} }
serde2/src/lib.rs
+2
View File
@@ -1,5 +1,7 @@
#![feature(macro_rules)] #![feature(macro_rules)]
extern crate unicode;
pub use ser::{Serialize, Serializer}; pub use ser::{Serialize, Serializer};
//pub use ser::{Visitor, VisitorState}; //pub use ser::{Visitor, VisitorState};
//pub use ser::GatherTokens; //pub use ser::GatherTokens;