diff options
| author | bors <bors@rust-lang.org> | 2018-03-30 04:17:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-30 04:17:05 +0000 |
| commit | d8a1bc73f742d5c1e747270bdc8b5a6e97ba3bb1 (patch) | |
| tree | 59ac1ead4709d7b31c16dcab52e9511f905ae761 /src/liballoc | |
| parent | 15e8c5d8466ae40c1ef9b2a1d96f9cd2c4dcccf0 (diff) | |
| parent | 67e0c2b52939de562fb06910295a6247750c11bc (diff) | |
| download | rust-d8a1bc73f742d5c1e747270bdc8b5a6e97ba3bb1.tar.gz rust-d8a1bc73f742d5c1e747270bdc8b5a6e97ba3bb1.zip | |
Auto merge of #49489 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #49443, #49445, #49446, #49463, #49464, #49466, #49468, #49473, #49484, #49486 - Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/vec.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index bfd806f99e7..fdc3ef4efb8 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -62,7 +62,7 @@ use core::any::Any; use core::borrow; use core::cmp::Ordering; use core::fmt; -use core::hash::{self, Hash, Hasher}; +use core::hash::{Hash, Hasher}; use core::iter::FusedIterator; use core::marker::{self, Unpin, Unsize}; use core::mem::{self, Pin}; @@ -508,7 +508,7 @@ impl<T: ?Sized + Eq> Eq for Box<T> {} #[stable(feature = "rust1", since = "1.0.0")] impl<T: ?Sized + Hash> Hash for Box<T> { - fn hash<H: hash::Hasher>(&self, state: &mut H) { + fn hash<H: Hasher>(&self, state: &mut H) { (**self).hash(state); } } diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index df08e46fe25..2eedb964f88 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -1599,8 +1599,8 @@ impl_spec_from_elem!(u64, |x| x == 0); impl_spec_from_elem!(u128, |x| x == 0); impl_spec_from_elem!(usize, |x| x == 0); -impl_spec_from_elem!(f32, |x: f32| x == 0. && x.is_sign_positive()); -impl_spec_from_elem!(f64, |x: f64| x == 0. && x.is_sign_positive()); +impl_spec_from_elem!(f32, |x: f32| x.to_bits() == 0); +impl_spec_from_elem!(f64, |x: f64| x.to_bits() == 0); //////////////////////////////////////////////////////////////////////////////// // Common trait implementations for Vec |