More fixes

phf_macros/src/lib.rs

@@ -2,7 +2,7 @@
 //!
 //! See the documentation for the `phf` crate for more details.
 #![doc(html_root_url="http://sfackler.github.io/rust-phf/doc")]
-#![feature(plugin_registrar, quote, rustc_private, hash, core, env, std_misc)]
+#![feature(plugin_registrar, quote, rustc_private, core, env, std_misc)]
 
 extern crate rand;
 extern crate syntax;

phf_macros/src/util.rs

@@ -1,6 +1,6 @@
 use std::env;
 use std::rc::Rc;
-use std::hash::{self, Hash, Hasher};
+use std::hash::{Hash, Hasher};
 use std::iter::repeat;
 
 use syntax::ast::Expr;
@@ -33,8 +33,8 @@ pub enum Key {
     Bool(bool),
 }
 
-impl<S> Hash<S> for Key where S: Hasher + hash::Writer {
-    fn hash(&self, state: &mut S) {
+impl Hash for Key {
+    fn hash<S: Hasher>(&self, state: &mut S) {
         match *self {
             Key::Str(ref s) => s.hash(state),
             Key::Binary(ref b) => b.hash(state),

phf_shared/src/lib.rs

@@ -1,12 +1,11 @@
-#![feature(hash, core)]
+#![feature(hash)]
 #![cfg_attr(feature = "core", feature(no_std))]
 #![cfg_attr(feature = "core", no_std)]
 #![doc(html_root_url="http://sfackler.github.io/rust-phf/doc")]
 
 #[cfg(feature = "core")]
 extern crate core;
 
-use std::slice::AsSlice;
 use std::str::StrExt;
 use std::hash::{Hasher, Hash, SipHasher};