diff options
Diffstat (limited to 'components/canvas_traits')
-rw-r--r-- | components/canvas_traits/canvas.rs | 2 | ||||
-rw-r--r-- | components/canvas_traits/lib.rs | 7 | ||||
-rw-r--r-- | components/canvas_traits/webgl.rs | 3 | ||||
-rw-r--r-- | components/canvas_traits/webgl_channel/mod.rs | 1 |
4 files changed, 5 insertions, 8 deletions
diff --git a/components/canvas_traits/canvas.rs b/components/canvas_traits/canvas.rs index a7a8ec12a0a..6065b714ce0 100644 --- a/components/canvas_traits/canvas.rs +++ b/components/canvas_traits/canvas.rs @@ -5,6 +5,8 @@ use cssparser::RGBA; use euclid::default::{Point2D, Rect, Size2D, Transform2D}; use ipc_channel::ipc::{IpcBytesReceiver, IpcBytesSender, IpcSender, IpcSharedMemory}; +use malloc_size_of_derive::MallocSizeOf; +use serde::{Deserialize, Serialize}; use serde_bytes::ByteBuf; use std::default::Default; use std::str::FromStr; diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs index 467eb432e0f..e7aeef0fb67 100644 --- a/components/canvas_traits/lib.rs +++ b/components/canvas_traits/lib.rs @@ -10,13 +10,6 @@ use crate::canvas::CanvasId; use crossbeam_channel::Sender; use euclid::default::Size2D; -#[macro_use] -extern crate lazy_static; -#[macro_use] -extern crate malloc_size_of_derive; -#[macro_use] -extern crate serde; - pub mod canvas; #[macro_use] pub mod webgl; diff --git a/components/canvas_traits/webgl.rs b/components/canvas_traits/webgl.rs index 0ea7fb1edde..914b06e7b9f 100644 --- a/components/canvas_traits/webgl.rs +++ b/components/canvas_traits/webgl.rs @@ -4,6 +4,7 @@ use euclid::default::{Rect, Size2D}; use ipc_channel::ipc::{IpcBytesReceiver, IpcBytesSender, IpcSharedMemory}; +use malloc_size_of_derive::MallocSizeOf; use pixels::PixelFormat; use serde::{Deserialize, Serialize}; use sparkle::gl; @@ -889,7 +890,7 @@ parameters! { macro_rules! gl_enums { ($(pub enum $name:ident { $($variant:ident = $mod:ident::$constant:ident,)+ })*) => { $( - #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, MallocSizeOf)] + #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, malloc_size_of_derive::MallocSizeOf)] #[derive(PartialEq, Serialize)] #[repr(u32)] pub enum $name { $($variant = $mod::$constant,)+ } diff --git a/components/canvas_traits/webgl_channel/mod.rs b/components/canvas_traits/webgl_channel/mod.rs index 30dc9543f91..6aa14187699 100644 --- a/components/canvas_traits/webgl_channel/mod.rs +++ b/components/canvas_traits/webgl_channel/mod.rs @@ -10,6 +10,7 @@ mod mpsc; use crate::webgl::WebGLMsg; use ipc_channel::ipc::IpcSender; use ipc_channel::router::ROUTER; +use lazy_static::lazy_static; use serde::{Deserialize, Serialize}; use servo_config::opts; use std::fmt; |