aboutsummaryrefslogtreecommitdiffstats
path: root/components/webdriver_server/lib.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/webdriver_server/lib.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/webdriver_server/lib.rs')
-rw-r--r--components/webdriver_server/lib.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index e6cf2ac6f62..9994f0b751e 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -22,8 +22,8 @@ extern crate net_traits;
extern crate regex;
extern crate rustc_serialize;
extern crate script_traits;
+extern crate servo_config;
extern crate servo_url;
-extern crate util;
extern crate uuid;
extern crate webdriver;
@@ -42,6 +42,7 @@ use rustc_serialize::json::{Json, ToJson};
use script_traits::{ConstellationMsg, LoadData, WebDriverCommandMsg};
use script_traits::webdriver_msg::{LoadStatus, WebDriverCookieError, WebDriverFrameId};
use script_traits::webdriver_msg::{WebDriverJSError, WebDriverJSResult, WebDriverScriptCommand};
+use servo_config::prefs::{PREFS, PrefValue};
use servo_url::ServoUrl;
use std::borrow::ToOwned;
use std::collections::BTreeMap;
@@ -49,8 +50,6 @@ use std::net::{SocketAddr, SocketAddrV4};
use std::sync::mpsc::Sender;
use std::thread;
use std::time::Duration;
-use util::prefs::{PREFS, PrefValue};
-use util::thread::spawn_named;
use uuid::Uuid;
use webdriver::command::{AddCookieParameters, GetParameters, JavascriptCommandParameters};
use webdriver::command::{LocatorParameters, Parameters};
@@ -88,13 +87,13 @@ fn cookie_msg_to_cookie(cookie: cookie_rs::Cookie) -> Cookie {
pub fn start_server(port: u16, constellation_chan: Sender<ConstellationMsg>) {
let handler = Handler::new(constellation_chan);
- spawn_named("WebdriverHttpServer".to_owned(), move || {
+ thread::Builder::new().name("WebdriverHttpServer".to_owned()).spawn(move || {
let address = SocketAddrV4::new("0.0.0.0".parse().unwrap(), port);
match server::start(SocketAddr::V4(address), handler, extension_routes()) {
Ok(listening) => info!("WebDriver server listening on {}", listening.socket),
Err(_) => panic!("Unable to start WebDriver HTTPD server"),
}
- });
+ }).expect("Thread spawning failed");
}
struct WebDriverSession {