auto merge of #5256 : servo/servo/rustup_20150311, r=jdm

...v.

Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28

1 files changed, 3 insertions, 3 deletions

diff --git a/components/gfx/buffer_map.rs b/components/gfx/buffer_map.rs
index c33617a7c9e..c16ae23eb13 100644
--- a/components/gfx/buffer_map.rs
+++ b/components/gfx/buffer_map.rs
@@ -7,7 +7,7 @@ use std::collections::hash_map::Entry::{Occupied, Vacant};
 use geom::size::Size2D;
 use layers::platform::surface::NativePaintingGraphicsContext;
 use layers::layers::LayerBuffer;
-use std::hash::{Hash, Hasher, Writer};
+use std::hash::{Hash, Hasher};
 use std::mem;
 
 /// This is a struct used to store buffers when they are not in use.
@@ -29,8 +29,8 @@ pub struct BufferMap {
 #[derive(Eq, Copy)]
 struct BufferKey([uint; 2]);
 
-impl<H: Hasher+Writer> Hash<H> for BufferKey {
-    fn hash(&self, state: &mut H) {
+impl Hash for BufferKey {
+    fn hash<H: Hasher>(&self, state: &mut H) {
         let BufferKey(ref bytes) = *self;
         bytes.as_slice().hash(state);
     }