about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-12-17 16:43:20 +0000
committerbors <bors@rust-lang.org>2014-12-17 16:43:20 +0000
commit66c297d847ce06a8982d4d322221b17a3cd04f90 (patch)
tree176a26b3e25b0e62d904e7af64476098e9f3e46e /src/libstd
parent2c533efd090e709a682468813aff36c368fdcd9d (diff)
parent24a8ef63ff786dd702d428f73fd64aac2a828f19 (diff)
downloadrust-66c297d847ce06a8982d4d322221b17a3cd04f90.tar.gz
rust-66c297d847ce06a8982d4d322221b17a3cd04f90.zip
auto merge of #19800 : sfackler/rust/core-hash, r=alexcrichton
r? @alexcrichton 
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/hash.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/hash.rs b/src/libstd/hash.rs
index ac68e1ef121..a63abec96d5 100644
--- a/src/libstd/hash.rs
+++ b/src/libstd/hash.rs
@@ -61,7 +61,7 @@
 
 #![experimental]
 
-pub use core_collections::hash::{Hash, Hasher, Writer, hash, sip};
+pub use core::hash::{Hash, Hasher, Writer, hash, sip};
 
 use core::kinds::Sized;
 use default::Default;