aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/filemanager_thread.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-12-14 16:48:42 -0800
committerGitHub <noreply@github.com>2016-12-14 16:48:42 -0800
commit4eb653817f87e5fb47de34356f558eb76ecbca9f (patch)
treef7ad2b7f47c0df54aa6d190912f95dff621cc9ac /components/net/filemanager_thread.rs
parent6ee175bf705108ab25e80521d7be84b5e58ef698 (diff)
parent9be4fd56ce5467ce6d0e48c6efda9eb26f40eb7a (diff)
downloadservo-4eb653817f87e5fb47de34356f558eb76ecbca9f.tar.gz
servo-4eb653817f87e5fb47de34356f558eb76ecbca9f.zip
Auto merge of #14592 - asajeffrey:util-goodbye, r=mbrubeck
Remove the util crate <!-- Please describe your changes on the following line: --> This PR removes the `util` crate. * Replaced the `spawn_named` and `clamp` functions by appropriate uses of `std::thread::Builder::spawn`, `std::cmp::min` and `std::cmp::max`. * Moved `opts`, `prefs` and `resource_files` into a new `config` crate. * Moved `remutex` and `geometry` into their own crates. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because they are refactorings <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14592) <!-- Reviewable:end -->
Diffstat (limited to 'components/net/filemanager_thread.rs')
-rw-r--r--components/net/filemanager_thread.rs20
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);