diff options
| author | bors <bors@rust-lang.org> | 2016-10-03 11:00:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 11:00:03 -0700 |
| commit | 7a26aeca77bcf334747eddb630e3b9475149b7f5 (patch) | |
| tree | 1c3b1e3e30d338f9ecdc2d8b9badf13d1ab4cb84 /src/libstd/path.rs | |
| parent | ff713464e6530fab2e13d0965929d8189c59ae56 (diff) | |
| parent | 10c3134da025f3d63700abf52769c0f106637a14 (diff) | |
| download | rust-7a26aeca77bcf334747eddb630e3b9475149b7f5.tar.gz rust-7a26aeca77bcf334747eddb630e3b9475149b7f5.zip | |
Auto merge of #36815 - alexcrichton:stabilize-1.13, r=aturon
std: Stabilize and deprecate APIs for 1.13 This commit is intended to be backported to the 1.13 branch, and works with the following APIs: Stabilized * `i32::checked_abs` * `i32::wrapping_abs` * `i32::overflowing_abs` * `RefCell::try_borrow` * `RefCell::try_borrow_mut` Deprecated * `BinaryHeap::push_pop` * `BinaryHeap::replace` * `SipHash13` * `SipHash24` * `SipHasher` - use `DefaultHasher` instead in the `std::collections::hash_map` module Closes #28147 Closes #34767 Closes #35057 Closes #35070
Diffstat (limited to 'src/libstd/path.rs')
| -rw-r--r-- | src/libstd/path.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs index fdc1978b0c5..d6a5dfe5518 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -3387,10 +3387,11 @@ mod tests { #[test] pub fn test_compare() { - use hash::{Hash, Hasher, SipHasher}; + use hash::{Hash, Hasher}; + use collections::hash_map::DefaultHasher; fn hash<T: Hash>(t: T) -> u64 { - let mut s = SipHasher::new_with_keys(0, 0); + let mut s = DefaultHasher::new(); t.hash(&mut s); s.finish() } |