Removed util.

components/canvas/Cargo.toml

@@ -19,7 +19,7 @@ log = "0.3.5"
 num-traits = "0.1.32"
 offscreen_gl_context = "0.5.0"
 plugins = {path = "../plugins"}
-util = {path = "../util"}
+servo_config = {path = "../config"}
 
 [dependencies.webrender_traits]
 git = "https://github.com/servo/webrender"

components/canvas/canvas_paint_thread.rs

@@ -15,7 +15,7 @@ use ipc_channel::ipc::{self, IpcSender};
 use num_traits::ToPrimitive;
 use std::borrow::ToOwned;
 use std::mem;
-use util::thread::spawn_named;
+use std::thread;
 use webrender_traits;
 
 impl<'a> CanvasPaintThread<'a> {
@@ -121,7 +121,7 @@ impl<'a> CanvasPaintThread<'a> {
                  antialias: bool)
                  -> IpcSender<CanvasMsg> {
         let (sender, receiver) = ipc::channel::<CanvasMsg>().unwrap();
-        spawn_named("CanvasThread".to_owned(), move || {
+        thread::Builder::new().name("CanvasThread".to_owned()).spawn(move || {
             let mut painter = CanvasPaintThread::new(size, webrender_api_sender, antialias);
             loop {
                 let msg = receiver.recv();
@@ -211,7 +211,7 @@ impl<'a> CanvasPaintThread<'a> {
                     CanvasMsg::WebGL(_) => panic!("Wrong message sent to Canvas2D thread"),
                 }
             }
-        });
+        }).expect("Thread spawning failed");
 
         sender
     }

components/canvas/lib.rs

@@ -17,7 +17,7 @@ extern crate ipc_channel;
 extern crate log;
 extern crate num_traits;
 extern crate offscreen_gl_context;
-extern crate util;
+extern crate servo_config;
 extern crate webrender_traits;
 
 pub mod canvas_paint_thread;

components/canvas/webgl_paint_thread.rs

@@ -9,10 +9,10 @@ use gleam::gl;
 use ipc_channel::ipc::{self, IpcSender};
 use offscreen_gl_context::{ColorAttachmentType, GLContext, GLLimits};
 use offscreen_gl_context::{GLContextAttributes, NativeGLContext, OSMesaContext};
+use servo_config::opts;
 use std::borrow::ToOwned;
 use std::sync::mpsc::channel;
-use util::opts;
-use util::thread::spawn_named;
+use std::thread;
 use webrender_traits;
 
 enum GLContextWrapper {
@@ -151,7 +151,7 @@ impl WebGLPaintThread {
                  -> Result<(IpcSender<CanvasMsg>, GLLimits), String> {
         let (sender, receiver) = ipc::channel::<CanvasMsg>().unwrap();
         let (result_chan, result_port) = channel();
-        spawn_named("WebGLThread".to_owned(), move || {
+        thread::Builder::new().name("WebGLThread".to_owned()).spawn(move || {
             let mut painter = match WebGLPaintThread::new(size, attrs, webrender_api_sender) {
                 Ok((thread, limits)) => {
                     result_chan.send(Ok(limits)).unwrap();
@@ -191,7 +191,7 @@ impl WebGLPaintThread {
                     CanvasMsg::Canvas2d(_) => panic!("Wrong message sent to WebGLThread"),
                 }
             }
-        });
+        }).expect("Thread spawning failed");
 
         result_port.recv().unwrap().map(|limits| (sender, limits))
     }