diff options
Diffstat (limited to 'components/style_traits')
| -rw-r--r-- | components/style_traits/arc_slice.rs | 2 | ||||
| -rw-r--r-- | components/style_traits/owned_slice.rs | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/components/style_traits/arc_slice.rs b/components/style_traits/arc_slice.rs index f7097e3d086..dd1b99d3424 100644 --- a/components/style_traits/arc_slice.rs +++ b/components/style_traits/arc_slice.rs @@ -21,7 +21,7 @@ const ARC_SLICE_CANARY: u32 = 0xf3f3f3f3; /// cbindgen:derive-eq=false /// cbindgen:derive-neq=false #[repr(C)] -#[derive(Debug, Clone, PartialEq, Eq, ToShmem)] +#[derive(Clone, Debug, Eq, PartialEq, ToShmem)] pub struct ArcSlice<T>(#[shmem(field_bound)] ThinArc<u32, T>); impl<T> Deref for ArcSlice<T> { diff --git a/components/style_traits/owned_slice.rs b/components/style_traits/owned_slice.rs index 6e54aaeef5f..f2b0de4a4a0 100644 --- a/components/style_traits/owned_slice.rs +++ b/components/style_traits/owned_slice.rs @@ -6,11 +6,11 @@ //! A replacement for `Box<[T]>` that cbindgen can understand. +use malloc_size_of::{MallocShallowSizeOf, MallocSizeOf, MallocSizeOfOps}; use std::marker::PhantomData; -use std::{fmt, mem, slice}; -use std::ptr::NonNull; use std::ops::{Deref, DerefMut}; -use malloc_size_of::{MallocSizeOf, MallocShallowSizeOf, MallocSizeOfOps}; +use std::ptr::NonNull; +use std::{fmt, mem, slice}; use to_shmem::{SharedMemoryBuilder, ToShmem}; /// A struct that basically replaces a `Box<[T]>`, but which cbindgen can @@ -86,9 +86,7 @@ impl<T: Sized> OwnedSlice<T> { /// Convert the OwnedSlice into a Vec. #[inline] pub fn into_vec(self) -> Vec<T> { - let ret = unsafe { - Vec::from_raw_parts(self.ptr.as_ptr(), self.len, self.len) - }; + let ret = unsafe { Vec::from_raw_parts(self.ptr.as_ptr(), self.len, self.len) }; mem::forget(self); ret } |