From 54950635d9b5f838cda70d5906c10a015de15846 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Sat, 17 May 2014 20:18:32 -0700
Subject: [PATCH] Update to head

---
 de.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de.rs b/de.rs
index f2517f22..a1870f6c 100644
--- a/de.rs
+++ b/de.rs
@@ -516,7 +516,7 @@ mod tests {
         fn read_f64(&mut self) -> Result<f64, Error> { Err(SyntaxError) }
         fn read_f32(&mut self) -> Result<f32, Error> { Err(SyntaxError) }
         fn read_char(&mut self) -> Result<char, Error> { Err(SyntaxError) }
-        fn read_str(&mut self) -> Result<~str, Error> { Err(SyntaxError) }
+        fn read_str(&mut self) -> Result<StrBuf, Error> { Err(SyntaxError) }
 
         // Compound types:
         fn read_enum<T>(&mut self, _name: &str, _f: |&mut IntsDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }