aboutsummaryrefslogtreecommitdiffstats
path: root/components/bluetooth_traits
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/bluetooth_traits
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/bluetooth_traits')
-rw-r--r--components/bluetooth_traits/Cargo.toml2
-rw-r--r--components/bluetooth_traits/blocklist.rs2
-rw-r--r--components/bluetooth_traits/lib.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/components/bluetooth_traits/Cargo.toml b/components/bluetooth_traits/Cargo.toml
index 5ac8057c2b2..c2c5a632b2d 100644
--- a/components/bluetooth_traits/Cargo.toml
+++ b/components/bluetooth_traits/Cargo.toml
@@ -14,4 +14,4 @@ ipc-channel = "0.5"
regex = "0.1.43"
serde = "0.8"
serde_derive = "0.8"
-util = {path = "../util"}
+servo_config = {path = "../config"}
diff --git a/components/bluetooth_traits/blocklist.rs b/components/bluetooth_traits/blocklist.rs
index f859def1379..26df3413c10 100644
--- a/components/bluetooth_traits/blocklist.rs
+++ b/components/bluetooth_traits/blocklist.rs
@@ -3,11 +3,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use regex::Regex;
+use servo_config::resource_files::read_resource_file;
use std::cell::RefCell;
use std::collections::HashMap;
use std::io::BufRead;
use std::string::String;
-use util::resource_files::read_resource_file;
const BLOCKLIST_FILE: &'static str = "gatt_blocklist.txt";
const BLOCKLIST_FILE_NOT_FOUND: &'static str = "Could not find gatt_blocklist.txt file";
diff --git a/components/bluetooth_traits/lib.rs b/components/bluetooth_traits/lib.rs
index 5246f4fbe3d..81f224ab3bd 100644
--- a/components/bluetooth_traits/lib.rs
+++ b/components/bluetooth_traits/lib.rs
@@ -8,7 +8,7 @@ extern crate ipc_channel;
extern crate regex;
#[macro_use]
extern crate serde_derive;
-extern crate util;
+extern crate servo_config;
pub mod blocklist;
pub mod scanfilter;