mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev.
This commit is contained in:
parent
ff8cbff810
commit
95fc29fa0d
255 changed files with 3550 additions and 3362 deletions
|
@ -26,7 +26,7 @@ use servo_util::cursor::Cursor;
|
|||
use servo_util::geometry::PagePx;
|
||||
use servo_util::memory::MemoryProfilerChan;
|
||||
use servo_util::time::TimeProfilerChan;
|
||||
use std::comm::{channel, Sender, Receiver};
|
||||
use std::sync::mpsc::{channel, Sender, Receiver};
|
||||
use std::fmt::{Error, Formatter, Show};
|
||||
use std::rc::Rc;
|
||||
|
||||
|
@ -42,7 +42,7 @@ pub trait CompositorProxy : 'static + Send {
|
|||
|
||||
/// The port that the compositor receives messages on. As above, this is a trait supplied by the
|
||||
/// Servo port.
|
||||
pub trait CompositorReceiver for Sized? : 'static {
|
||||
pub trait CompositorReceiver : 'static {
|
||||
/// Receives the next message inbound for the compositor. This must not block.
|
||||
fn try_recv_compositor_msg(&mut self) -> Option<Msg>;
|
||||
/// Synchronously waits for, and returns, the next message inbound for the compositor.
|
||||
|
@ -58,7 +58,7 @@ impl CompositorReceiver for Receiver<Msg> {
|
|||
}
|
||||
}
|
||||
fn recv_compositor_msg(&mut self) -> Msg {
|
||||
self.recv()
|
||||
self.recv().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -79,7 +79,7 @@ impl ScriptListener for Box<CompositorProxy+'static+Send> {
|
|||
fn close(&mut self) {
|
||||
let (chan, port) = channel();
|
||||
self.send(Msg::Exit(chan));
|
||||
port.recv();
|
||||
port.recv().unwrap();
|
||||
}
|
||||
|
||||
fn dup(&mut self) -> Box<ScriptListener+'static> {
|
||||
|
@ -98,7 +98,7 @@ impl ScriptListener for Box<CompositorProxy+'static+Send> {
|
|||
}
|
||||
|
||||
/// Information about each layer that the compositor keeps.
|
||||
#[deriving(Copy)]
|
||||
#[derive(Copy)]
|
||||
pub struct LayerProperties {
|
||||
pub pipeline_id: PipelineId,
|
||||
pub epoch: Epoch,
|
||||
|
@ -129,7 +129,7 @@ impl PaintListener for Box<CompositorProxy+'static+Send> {
|
|||
fn get_graphics_metadata(&mut self) -> Option<NativeGraphicsMetadata> {
|
||||
let (chan, port) = channel();
|
||||
self.send(Msg::GetGraphicsMetadata(chan));
|
||||
port.recv()
|
||||
port.recv().unwrap()
|
||||
}
|
||||
|
||||
fn assign_painted_buffers(&mut self,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue