diff options
| -rw-r--r-- | components/msg/compositor_msg.rs | 8 | ||||
| -rw-r--r-- | components/msg/constellation_msg.rs | 10 | ||||
| -rw-r--r-- | components/msg/lib.rs | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/components/msg/compositor_msg.rs b/components/msg/compositor_msg.rs index 111636c349c..54dc125f589 100644 --- a/components/msg/compositor_msg.rs +++ b/components/msg/compositor_msg.rs @@ -8,7 +8,7 @@ use geom::point::Point2D; use geom::rect::Rect; use layers::platform::surface::NativeGraphicsMetadata; use layers::layers::LayerBufferSet; -use std::fmt::{Formatter, Show}; +use std::fmt::{Formatter, Debug}; use std::fmt; use constellation_msg::PipelineId; @@ -20,7 +20,7 @@ pub enum PaintState { Painting, } -#[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Show, Copy)] +#[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Debug, Copy)] pub enum ReadyState { /// Informs the compositor that nothing has been done yet. Used for setting status Blank, @@ -33,7 +33,7 @@ pub enum ReadyState { } /// A newtype struct for denoting the age of messages; prevents race conditions. -#[derive(PartialEq, Eq, Show, Copy)] +#[derive(PartialEq, Eq, Debug, Copy)] pub struct Epoch(pub uint); impl Epoch { @@ -46,7 +46,7 @@ impl Epoch { #[derive(Clone, PartialEq, Eq, Copy)] pub struct LayerId(pub uint, pub uint); -impl Show for LayerId { +impl Debug for LayerId { fn fmt(&self, f: &mut Formatter) -> fmt::Result { let LayerId(a, b) = *self; write!(f, "Layer({}, {})", a, b) diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 67449d4d9ec..27a187edfde 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -60,7 +60,7 @@ pub enum KeyState { } //N.B. Based on the glutin key enum -#[derive(Show, PartialEq, Eq, Copy, Clone)] +#[derive(Debug, PartialEq, Eq, Copy, Clone)] pub enum Key { Space, Apostrophe, @@ -237,22 +237,22 @@ impl LoadData { } /// Represents the two different ways to which a page can be navigated -#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)] +#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] pub enum NavigationType { Load, // entered or clicked on a url Navigate, // browser forward/back buttons } -#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)] +#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] pub enum NavigationDirection { Forward, Back, } -#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)] +#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] pub struct PipelineId(pub uint); -#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)] +#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] pub struct SubpageId(pub uint); // The type of pipeline exit. During complete shutdowns, pipelines do not have to diff --git a/components/msg/lib.rs b/components/msg/lib.rs index 869b095a882..3fed347b085 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -2,10 +2,11 @@ * 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/. */ +#![feature(hash)] #![feature(int_uint)] +#![feature(rustc_private)] #![allow(missing_copy_implementations)] -#![allow(unstable)] extern crate azure; #[macro_use] extern crate bitflags; |