Fix warnings in msg.

This commit is contained in:
Ms2ger 2015-02-13 11:08:31 +01:00
parent 58180fa4f7
commit 2ca59b3f5b
3 changed files with 11 additions and 10 deletions

View file

@ -8,7 +8,7 @@ use geom::point::Point2D;
use geom::rect::Rect; use geom::rect::Rect;
use layers::platform::surface::NativeGraphicsMetadata; use layers::platform::surface::NativeGraphicsMetadata;
use layers::layers::LayerBufferSet; use layers::layers::LayerBufferSet;
use std::fmt::{Formatter, Show}; use std::fmt::{Formatter, Debug};
use std::fmt; use std::fmt;
use constellation_msg::PipelineId; use constellation_msg::PipelineId;
@ -20,7 +20,7 @@ pub enum PaintState {
Painting, Painting,
} }
#[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Show, Copy)] #[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Debug, Copy)]
pub enum ReadyState { pub enum ReadyState {
/// Informs the compositor that nothing has been done yet. Used for setting status /// Informs the compositor that nothing has been done yet. Used for setting status
Blank, Blank,
@ -33,7 +33,7 @@ pub enum ReadyState {
} }
/// A newtype struct for denoting the age of messages; prevents race conditions. /// 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); pub struct Epoch(pub uint);
impl Epoch { impl Epoch {
@ -46,7 +46,7 @@ impl Epoch {
#[derive(Clone, PartialEq, Eq, Copy)] #[derive(Clone, PartialEq, Eq, Copy)]
pub struct LayerId(pub uint, pub uint); pub struct LayerId(pub uint, pub uint);
impl Show for LayerId { impl Debug for LayerId {
fn fmt(&self, f: &mut Formatter) -> fmt::Result { fn fmt(&self, f: &mut Formatter) -> fmt::Result {
let LayerId(a, b) = *self; let LayerId(a, b) = *self;
write!(f, "Layer({}, {})", a, b) write!(f, "Layer({}, {})", a, b)

View file

@ -60,7 +60,7 @@ pub enum KeyState {
} }
//N.B. Based on the glutin key enum //N.B. Based on the glutin key enum
#[derive(Show, PartialEq, Eq, Copy, Clone)] #[derive(Debug, PartialEq, Eq, Copy, Clone)]
pub enum Key { pub enum Key {
Space, Space,
Apostrophe, Apostrophe,
@ -237,22 +237,22 @@ impl LoadData {
} }
/// Represents the two different ways to which a page can be navigated /// 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 { pub enum NavigationType {
Load, // entered or clicked on a url Load, // entered or clicked on a url
Navigate, // browser forward/back buttons Navigate, // browser forward/back buttons
} }
#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)] #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)]
pub enum NavigationDirection { pub enum NavigationDirection {
Forward, Forward,
Back, Back,
} }
#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)] #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)]
pub struct PipelineId(pub uint); pub struct PipelineId(pub uint);
#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)] #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)]
pub struct SubpageId(pub uint); pub struct SubpageId(pub uint);
// The type of pipeline exit. During complete shutdowns, pipelines do not have to // The type of pipeline exit. During complete shutdowns, pipelines do not have to

View file

@ -2,10 +2,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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 http://mozilla.org/MPL/2.0/. */
#![feature(hash)]
#![feature(int_uint)] #![feature(int_uint)]
#![feature(rustc_private)]
#![allow(missing_copy_implementations)] #![allow(missing_copy_implementations)]
#![allow(unstable)]
extern crate azure; extern crate azure;
#[macro_use] extern crate bitflags; #[macro_use] extern crate bitflags;