Fix: Utf16 handling moved from std into unicode crate

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

View File

@ -1,6 +1,6 @@
use std::str;
use std::num::Float;
use std::str::ScalarValue;
use unicode::str::Utf16Item;
use std::char;
use de;
@ -379,8 +379,8 @@ impl<Iter: Iterator<u8>> Parser<Iter> {
}
let buf = &[n1, try!(self.decode_hex_escape())];
match str::utf16_items(buf.as_slice()).next() {
Some(ScalarValue(c)) => c,
match ::unicode::str::utf16_items(buf.as_slice()).next() {
Some(Utf16Item::ScalarValue(c)) => c,
_ => {
return Err(self.error(ErrorCode::LoneLeadingSurrogateInHexEscape));
}

View File

@ -12,6 +12,8 @@ extern crate serde_macros;
#[cfg(test)]
extern crate serialize;
extern crate unicode;
pub use de::{Deserializer, Deserialize};
pub use ser::{Serializer, Serialize};