From ec8b7c9b89ab66152281098364314637e9b52fe0 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Sat, 14 Mar 2015 14:57:13 -0700
Subject: [PATCH] Update to rust HEAD

---
 benches/bench_log.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/benches/bench_log.rs b/benches/bench_log.rs
index 2593d8df..61e15b4a 100644
--- a/benches/bench_log.rs
+++ b/benches/bench_log.rs
@@ -6,7 +6,7 @@ extern crate serde;
 extern crate "rustc-serialize" as rustc_serialize;
 extern crate test;
 
-use std::io::{self, ReadExt, WriteExt};
+use std::io::{self, Read, Write};
 use std::num::FromPrimitive;
 use test::Bencher;
 
@@ -637,7 +637,7 @@ impl MyMemWriter0 {
 }
 
 
-impl io::Write for MyMemWriter0 {
+impl Write for MyMemWriter0 {
     #[inline]
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         self.buf.push_all(buf);
@@ -682,7 +682,7 @@ fn push_all_bytes(dst: &mut Vec<u8>, src: &[u8]) {
     }
 }
 
-impl io::Write for MyMemWriter1 {
+impl Write for MyMemWriter1 {
     #[inline]
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         push_all_bytes(&mut self.buf, buf);
@@ -872,7 +872,7 @@ fn bench_copy(b: &mut Bencher) {
     });
 }
 
-fn manual_serialize_no_escape<W: io::Write>(wr: &mut W, log: &Log) {
+fn manual_serialize_no_escape<W: Write>(wr: &mut W, log: &Log) {
     wr.write(b"{\"timestamp\":").unwrap();
     (write!(wr, "{}", log.timestamp)).unwrap();
     wr.write(b",\"zone_id\":").unwrap();
@@ -929,7 +929,7 @@ fn manual_serialize_no_escape<W: io::Write>(wr: &mut W, log: &Log) {
     wr.write(b"}").unwrap();
 }
 
-fn manual_serialize_escape<W: io::Write>(wr: &mut W, log: &Log) {
+fn manual_serialize_escape<W: Write>(wr: &mut W, log: &Log) {
     wr.write_all(b"{").unwrap();
     escape_str(wr, "timestamp").unwrap();
     wr.write_all(b":").unwrap();