Upgrade to rustc ba2f13ef0 2015-02-04

This commit is contained in:
Simon Sapin 2015-01-31 14:36:05 +01:00 committed by Matt Brubeck
parent bc6882bdef
commit d5dd1d658e
136 changed files with 1091 additions and 878 deletions

View file

@ -42,7 +42,7 @@ use util::time::{TimeProfilerCategory, profile, TimeProfilerChan};
use util::{memory, time};
use std::collections::HashMap;
use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::path::Path;
use std::old_path::Path;
use std::num::Float;
use std::rc::Rc;
use std::slice::bytes::copy_memory;
@ -142,7 +142,7 @@ enum CompositionRequest {
CompositeNow,
}
#[derive(Copy, PartialEq, Show)]
#[derive(Copy, PartialEq, Debug)]
enum ShutdownState {
NotShuttingDown,
ShuttingDown,

View file

@ -27,7 +27,7 @@ use util::geometry::PagePx;
use util::memory::MemoryProfilerChan;
use util::time::TimeProfilerChan;
use std::sync::mpsc::{channel, Sender, Receiver};
use std::fmt::{Error, Formatter, Show};
use std::fmt::{Error, Formatter, Debug};
use std::rc::Rc;
/// Sends messages to the compositor. This is a trait supplied by the port because the method used
@ -223,7 +223,7 @@ pub enum Msg {
PaintTaskExited(PipelineId),
}
impl Show for Msg {
impl Debug for Msg {
fn fmt(&self, f: &mut Formatter) -> Result<(),Error> {
match *self {
Msg::Exit(..) => write!(f, "Exit"),

View file

@ -36,7 +36,7 @@ use util::time::TimeProfilerChan;
use std::borrow::ToOwned;
use std::cell::{Cell, RefCell};
use std::collections::{HashMap, HashSet};
use std::io;
use std::old_io as io;
use std::mem::replace;
use std::rc::Rc;
use std::sync::mpsc::{Receiver, channel};

View file

@ -3,10 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(box_syntax, plugin)]
#![feature(int_uint)]
#![feature(int_uint, core, libc, std_misc)]
#![allow(missing_copy_implementations)]
#![allow(unstable)]
#[macro_use]
extern crate log;

View file

@ -6,7 +6,7 @@
use compositor_task::{CompositorProxy, Msg};
use std::io::timer;
use std::old_io::timer;
use std::sync::mpsc::{Receiver, Sender, channel};
use std::thread::Builder;
use std::time::duration::Duration;

View file

@ -15,7 +15,7 @@ use msg::compositor_msg::{PaintState, ReadyState};
use msg::constellation_msg::{Key, KeyState, KeyModifiers, LoadData};
use util::cursor::Cursor;
use util::geometry::ScreenPx;
use std::fmt::{Error, Formatter, Show};
use std::fmt::{Error, Formatter, Debug};
use std::rc::Rc;
#[derive(Clone)]
@ -70,7 +70,7 @@ pub enum WindowEvent {
KeyEvent(Key, KeyState, KeyModifiers),
}
impl Show for WindowEvent {
impl Debug for WindowEvent {
fn fmt(&self, f: &mut Formatter) -> Result<(),Error> {
match *self {
WindowEvent::Idle => write!(f, "Idle"),