From 3cf0fb8d5b3ac96b985c7c2160c31cae1131e377 Mon Sep 17 00:00:00 2001
From: Thomas Bahn <thomas@thomas-bahn.net>
Date: Tue, 23 Dec 2014 16:44:10 +0100
Subject: [PATCH] Fix: Utf16 handling moved from std into unicode crate

Following a rust change.
---
 src/json/de.rs | 6 +++---
 src/lib.rs     | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/json/de.rs b/src/json/de.rs
index a0be628b..33eac20a 100644
--- a/src/json/de.rs
+++ b/src/json/de.rs
@@ -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));
                                     }
diff --git a/src/lib.rs b/src/lib.rs
index 60602976..c4df6b91 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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};