diff --git a/README.md b/README.md index e8ec1cf1fdf..47510a6422f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ against a released version of Rust will not work, nor will the Rust 'master' branch. The commit below will *probably* work. If it does not then the topic in #servo might know better. -* Last known-good Rust commit: a0fda80a528122183938e4f0297102adffd62639 +* Last known-good Rust commit: 624fbbd [rust]: http://www.rust-lang.org diff --git a/src/servo-gfx/render_layers.rs b/src/servo-gfx/render_layers.rs index 577db98bdea..fa6a79c341f 100644 --- a/src/servo-gfx/render_layers.rs +++ b/src/servo-gfx/render_layers.rs @@ -33,7 +33,7 @@ pub fn render_layers(layer_ref: *RenderLayer, f: RenderFn) -> LayerBufferSet { let tile_size = opts.tile_size; - let mut buffers = match move buffer_set { LayerBufferSet { buffers: move b } => move b }; + let mut _buffers = match move buffer_set { LayerBufferSet { buffers: move b } => move b }; // FIXME: Try not to create a new array here. let new_buffer_ports = dvec::DVec(); diff --git a/src/servo-gfx/render_task.rs b/src/servo-gfx/render_task.rs index 926a40f7ae1..4c42055e321 100644 --- a/src/servo-gfx/render_task.rs +++ b/src/servo-gfx/render_task.rs @@ -14,7 +14,7 @@ use geom::matrix2d::Matrix2D; use std::arc::ARC; use std::arc; use std::cell::Cell; -use std::thread_pool::ThreadPool; +use std::task_pool::TaskPool; pub enum Msg { RenderMsg(RenderLayer), @@ -37,7 +37,7 @@ pub fn RenderTask(compositor: C, opts: Opts) -> RenderTask { let n_threads = opts.n_render_threads; let new_opts_cell = Cell(move opts); - let thread_pool = do ThreadPool::new(n_threads, Some(SingleThreaded)) + let thread_pool = do TaskPool::new(n_threads, Some(SingleThreaded)) |move new_opts_cell| { let opts_cell = Cell(new_opts_cell.with_ref(|o| copy *o)); let f: ~fn(uint) -> ThreadRenderContext = |thread_index, move opts_cell| { @@ -71,7 +71,7 @@ priv struct Renderer { port: comm::Port, compositor: C, layer_buffer_set_port: Cell>, - thread_pool: ThreadPool, + thread_pool: TaskPool, opts: Opts, }