Removed util.

1 files changed, 10 insertions, 10 deletions

diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs
index 641b1394539..0fa1aeeca9c 100644
--- a/components/net/filemanager_thread.rs
+++ b/components/net/filemanager_thread.rs
@@ -7,6 +7,7 @@ use mime_guess::guess_mime_type_opt;
 use net_traits::blob_url_store::{BlobBuf, BlobURLStoreError};
 use net_traits::filemanager_thread::{FileManagerResult, FileManagerThreadMsg, FileOrigin, FilterPattern};
 use net_traits::filemanager_thread::{FileManagerThreadError, ReadFileProgress, RelativePos, SelectedFile};
+use servo_config::prefs::PREFS;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::{Read, Seek, SeekFrom};
@@ -14,11 +15,10 @@ use std::ops::Index;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, RwLock};
 use std::sync::atomic::{self, AtomicBool, AtomicUsize, Ordering};
+use std::thread;
 #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
 use tinyfiledialogs;
 use url::Url;
-use util::prefs::PREFS;
-use util::thread::spawn_named;
 use uuid::Uuid;
 
 /// The provider of file-dialog UI should implement this trait.
@@ -129,12 +129,12 @@ impl FileManager {
                      check_url_validity: bool,
                      origin: FileOrigin) {
         let store = self.store.clone();
-        spawn_named("read file".to_owned(), move || {
+        thread::Builder::new().name("read file".to_owned()).spawn(move || {
             if let Err(e) = store.try_read_file(&sender, id, check_url_validity,
                                                 origin) {
                 let _ = sender.send(Err(FileManagerThreadError::BlobURLStoreError(e)));
             }
-        })
+        }).expect("Thread spawning failed");
     }
 
     pub fn promote_memory(&self,
@@ -143,9 +143,9 @@ impl FileManager {
                           sender: IpcSender<Result<Uuid, BlobURLStoreError>>,
                           origin: FileOrigin) {
         let store = self.store.clone();
-        spawn_named("transfer memory".to_owned(), move || {
+        thread::Builder::new().name("transfer memory".to_owned()).spawn(move || {
             store.promote_memory(blob_buf, set_valid, sender, origin);
-        })
+        }).expect("Thread spawning failed");
     }
 
     /// Message handler
@@ -157,15 +157,15 @@ impl FileManager {
         match msg {
             FileManagerThreadMsg::SelectFile(filter, sender, origin, opt_test_path) => {
                 let store = self.store.clone();
-                spawn_named("select file".to_owned(), move || {
+                thread::Builder::new().name("select file".to_owned()).spawn(move || {
                     store.select_file(filter, sender, origin, opt_test_path, ui);
-                });
+                }).expect("Thread spawning failed");
             }
             FileManagerThreadMsg::SelectFiles(filter, sender, origin, opt_test_paths) => {
                 let store = self.store.clone();
-                spawn_named("select files".to_owned(), move || {
+                thread::Builder::new().name("select files".to_owned()).spawn(move || {
                     store.select_files(filter, sender, origin, opt_test_paths, ui);
-                })
+                }).expect("Thread spawning failed");
             }
             FileManagerThreadMsg::ReadFile(sender, id, check_url_validity, origin) => {
                 self.read_file(sender, id, check_url_validity, origin);