diff options
| -rw-r--r-- | src/libstd/hash/mod.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/hash.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libstd/hash/mod.rs b/src/libstd/hash/mod.rs index a510aa90343..7daba38fe41 100644 --- a/src/libstd/hash/mod.rs +++ b/src/libstd/hash/mod.rs @@ -65,7 +65,6 @@ use container::Container; use intrinsics::TypeId; -use io::Writer; use iter::Iterator; use option::{Option, Some, None}; use owned::Box; @@ -78,6 +77,8 @@ use vec::Vec; /// Reexport the `sip::hash` function as our default hasher. pub use hash = self::sip::hash; +pub use Writer = io::Writer; + pub mod sip; /// A trait that represents a hashable type. The `S` type parameter is an diff --git a/src/libsyntax/ext/deriving/hash.rs b/src/libsyntax/ext/deriving/hash.rs index 8ce98a04e28..3e6b8d522d4 100644 --- a/src/libsyntax/ext/deriving/hash.rs +++ b/src/libsyntax/ext/deriving/hash.rs @@ -27,7 +27,8 @@ pub fn expand_deriving_hash(cx: &mut ExtCtxt, vec!(box Literal(Path::new_local("__S"))), true), LifetimeBounds { lifetimes: Vec::new(), - bounds: vec!(("__S", ast::StaticSize, vec!(Path::new(vec!("std", "io", "Writer"))))), + bounds: vec!(("__S", ast::StaticSize, + vec!(Path::new(vec!("std", "hash", "Writer"))))), }, Path::new_local("__S")) } else { |