Removed util.

components/constellation/Cargo.toml

@@ -33,8 +33,9 @@ script_traits = {path = "../script_traits"}
 serde = "0.8"
 serde_derive = "0.8"
 style_traits = {path = "../style_traits"}
+servo_config = {path = "../config", features = ["servo"]}
+servo_remutex = {path = "../remutex"}
 servo_url = {path = "../url", features = ["servo"]}
-util = {path = "../util"}
 
 [dependencies.webrender_traits]
 git = "https://github.com/servo/webrender"

components/constellation/constellation.rs

@@ -47,6 +47,9 @@ use script_traits::{LayoutMsg as FromLayoutMsg, ScriptMsg as FromScriptMsg, Scri
 use script_traits::{LogEntry, ServiceWorkerMsg, webdriver_msg};
 use script_traits::{MozBrowserErrorType, MozBrowserEvent, WebDriverCommandMsg, WindowSizeData};
 use script_traits::{SWManagerMsg, ScopeThings, WindowSizeType};
+use servo_config::opts;
+use servo_config::prefs::PREFS;
+use servo_remutex::ReentrantMutex;
 use servo_url::ServoUrl;
 use std::borrow::ToOwned;
 use std::collections::{HashMap, VecDeque};
@@ -64,10 +67,6 @@ use style_traits::PagePx;
 use style_traits::cursor::Cursor;
 use style_traits::viewport::ViewportConstraints;
 use timer_scheduler::TimerScheduler;
-use util::opts;
-use util::prefs::PREFS;
-use util::remutex::ReentrantMutex;
-use util::thread::spawn_named;
 use webrender_traits;
 
 #[derive(Debug, PartialEq)]
@@ -505,7 +504,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
         let (swmanager_sender, swmanager_receiver) = ipc::channel().expect("ipc channel failure");
         let sw_mgr_clone = swmanager_sender.clone();
 
-        spawn_named("Constellation".to_owned(), move || {
+        thread::Builder::new().name("Constellation".to_owned()).spawn(move || {
             let (ipc_script_sender, ipc_script_receiver) = ipc::channel().expect("ipc channel failure");
             let script_receiver = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(ipc_script_receiver);
 
@@ -568,7 +567,8 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
             };
 
             constellation.run();
-        });
+        }).expect("Thread spawning failed");
+
         (compositor_sender, swmanager_sender)
     }
 

components/constellation/lib.rs

@@ -36,10 +36,10 @@ extern crate script_traits;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;
+extern crate servo_config;
+extern crate servo_remutex;
 extern crate servo_url;
 extern crate style_traits;
-#[macro_use]
-extern crate util;
 extern crate webrender_traits;
 
 mod constellation;

components/constellation/pipeline.rs

@@ -24,6 +24,8 @@ use script_traits::{ConstellationControlMsg, InitialScriptState};
 use script_traits::{LayoutControlMsg, LayoutMsg, LoadData, MozBrowserEvent};
 use script_traits::{NewLayoutInfo, SWManagerMsg, SWManagerSenders, ScriptMsg};
 use script_traits::{ScriptThreadFactory, TimerEventRequest, WindowSizeData};
+use servo_config::opts::{self, Opts};
+use servo_config::prefs::{PREFS, Pref};
 use servo_url::ServoUrl;
 use std::collections::HashMap;
 use std::env;
@@ -33,8 +35,6 @@ use std::process;
 use std::rc::Rc;
 use std::sync::mpsc::Sender;
 use style_traits::{PagePx, ViewportPx};
-use util::opts::{self, Opts};
-use util::prefs::{PREFS, Pref};
 use webrender_traits;
 
 /// A uniquely-identifiable pipeline of script thread, layout thread, and paint thread.

components/constellation/sandboxing.rs

@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use gaol::profile::{Operation, PathPattern, Profile};
+use servo_config::resource_files;
 use std::path::PathBuf;
-use util::resource_files;
 
 /// Our content process sandbox profile on Mac. As restrictive as possible.
 #[cfg(target_os = "macos")]