diff options
Diffstat (limited to 'components/script/dom/bindings/num.rs')
| -rw-r--r-- | components/script/dom/bindings/num.rs | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/components/script/dom/bindings/num.rs b/components/script/dom/bindings/num.rs index 03b0c743f9f..c7f987e98ef 100644 --- a/components/script/dom/bindings/num.rs +++ b/components/script/dom/bindings/num.rs @@ -1,15 +1,16 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ //! The `Finite<T>` struct. -use heapsize::HeapSizeOf; +use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use num_traits::Float; +use std::default::Default; use std::ops::Deref; /// Encapsulates the IDL restricted float type. -#[derive(JSTraceable, Clone, Copy, Eq, PartialEq)] +#[derive(Clone, Copy, Eq, JSTraceable, PartialEq)] pub struct Finite<T: Float>(T); impl<T: Float> Finite<T> { @@ -25,8 +26,10 @@ impl<T: Float> Finite<T> { /// Create a new `Finite<T: Float>`. #[inline] pub fn wrap(value: T) -> Finite<T> { - assert!(value.is_finite(), - "Finite<T> doesn't encapsulate unrestricted value."); + assert!( + value.is_finite(), + "Finite<T> doesn't encapsulate unrestricted value." + ); Finite(value) } } @@ -40,8 +43,14 @@ impl<T: Float> Deref for Finite<T> { } } -impl<T: Float + HeapSizeOf> HeapSizeOf for Finite<T> { - fn heap_size_of_children(&self) -> usize { - (**self).heap_size_of_children() +impl<T: Float + MallocSizeOf> MallocSizeOf for Finite<T> { + fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { + (**self).size_of(ops) + } +} + +impl<T: Float + Default> Default for Finite<T> { + fn default() -> Finite<T> { + Finite::wrap(T::default()) } } |