Auto merge of #12256 - nox:die-util-die, r=Ms2ger

Move some stuff from util to style

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12256)
<!-- Reviewable:end -->

4 files changed, 0 insertions, 157 deletions

diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml
index 8f8b26bcae2..f5c87179cfc 100644
--- a/components/util/Cargo.toml
+++ b/components/util/Cargo.toml
@@ -24,7 +24,6 @@ ipc-channel = {git = "https://github.com/servo/ipc-channel", optional = true}
 lazy_static = "0.2"
 log = "0.3.5"
 num_cpus = "0.2.2"
-num-traits = "0.1.32"
 rand = "0.3"
 rustc-serialize = "0.3"
 serde = {version = "0.7.11", optional = true}
diff --git a/components/util/lib.rs b/components/util/lib.rs
index fed8c9b0178..15fdaa5f332 100644
--- a/components/util/lib.rs
+++ b/components/util/lib.rs
@@ -21,7 +21,6 @@ extern crate getopts;
 #[allow(unused_extern_crates)] #[macro_use] extern crate lazy_static;
 #[macro_use] extern crate log;
 extern crate num_cpus;
-extern crate num_traits;
 extern crate rand;
 extern crate rustc_serialize;
 #[cfg(feature = "servo")] extern crate serde;
@@ -39,10 +38,8 @@ pub mod geometry;
 #[cfg(feature = "servo")] pub mod panicking;
 pub mod prefs;
 pub mod resource_files;
-pub mod str;
 pub mod thread;
 pub mod thread_state;
-pub mod tid;
 
 #[cfg(feature = "servo")]
 #[allow(unsafe_code)]
diff --git a/components/util/str.rs b/components/util/str.rs
deleted file mode 100644
index 73518625b6e..00000000000
--- a/components/util/str.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use num_traits::ToPrimitive;
-use std::convert::AsRef;
-use std::iter::{Filter, Peekable};
-use std::str::Split;
-
-pub type StaticCharVec = &'static [char];
-pub type StaticStringVec = &'static [&'static str];
-
-/// A "space character" according to:
-///
-/// https://html.spec.whatwg.org/multipage/#space-character
-pub static HTML_SPACE_CHARACTERS: StaticCharVec = &[
-    '\u{0020}',
-    '\u{0009}',
-    '\u{000a}',
-    '\u{000c}',
-    '\u{000d}',
-];
-
-#[inline]
-pub fn char_is_whitespace(c: char) -> bool {
-    HTML_SPACE_CHARACTERS.contains(&c)
-}
-
-pub fn is_whitespace(s: &str) -> bool {
-    s.chars().all(char_is_whitespace)
-}
-
-pub fn split_html_space_chars<'a>(s: &'a str) ->
-                                  Filter<Split<'a, StaticCharVec>, fn(&&str) -> bool> {
-    fn not_empty(&split: &&str) -> bool { !split.is_empty() }
-    s.split(HTML_SPACE_CHARACTERS).filter(not_empty as fn(&&str) -> bool)
-}
-
-pub fn split_commas<'a>(s: &'a str) -> Filter<Split<'a, char>, fn(&&str) -> bool> {
-    fn not_empty(&split: &&str) -> bool { !split.is_empty() }
-    s.split(',').filter(not_empty as fn(&&str) -> bool)
-}
-
-fn is_ascii_digit(c: &char) -> bool {
-    match *c {
-        '0'...'9' => true,
-        _ => false,
-    }
-}
-
-fn is_decimal_point(c: char) -> bool {
-    c == '.'
-}
-
-fn is_exponent_char(c: char) -> bool {
-    match c {
-        'e' | 'E' => true,
-        _ => false,
-    }
-}
-
-pub fn read_numbers<I: Iterator<Item=char>>(mut iter: Peekable<I>) -> (Option<i64>, usize) {
-    match iter.peek() {
-        Some(c) if is_ascii_digit(c) => (),
-        _ => return (None, 0),
-    }
-
-    iter.take_while(is_ascii_digit).map(|d| {
-        d as i64 - '0' as i64
-    }).fold((Some(0i64), 0), |accumulator, d| {
-        let digits = accumulator.0.and_then(|accumulator| {
-            accumulator.checked_mul(10)
-        }).and_then(|accumulator| {
-            accumulator.checked_add(d)
-        });
-        (digits, accumulator.1 + 1)
-    })
-}
-
-pub fn read_fraction<I: Iterator<Item=char>>(mut iter: Peekable<I>,
-                                             mut divisor: f64,
-                                             value: f64) -> (f64, usize) {
-    match iter.peek() {
-        Some(c) if is_decimal_point(*c) => (),
-        _ => return (value, 0),
-    }
-    iter.next();
-
-    iter.take_while(is_ascii_digit).map(|d|
-        d as i64 - '0' as i64
-    ).fold((value, 1), |accumulator, d| {
-        divisor *= 10f64;
-        (accumulator.0 + d as f64 / divisor,
-            accumulator.1 + 1)
-    })
-}
-
-pub fn read_exponent<I: Iterator<Item=char>>(mut iter: Peekable<I>) -> Option<i32> {
-    match iter.peek() {
-        Some(c) if is_exponent_char(*c) => (),
-        _ => return None,
-    }
-    iter.next();
-
-    match iter.peek() {
-        None => None,
-        Some(&'-') => {
-            iter.next();
-            read_numbers(iter).0.map(|exp| -exp.to_i32().unwrap_or(0))
-        }
-        Some(&'+') => {
-            iter.next();
-            read_numbers(iter).0.map(|exp| exp.to_i32().unwrap_or(0))
-        }
-        Some(_) => read_numbers(iter).0.map(|exp| exp.to_i32().unwrap_or(0))
-    }
-}
-
-pub fn str_join<I, T>(strs: I, join: &str) -> String
-    where I: IntoIterator<Item=T>, T: AsRef<str>,
-{
-    strs.into_iter().enumerate().fold(String::new(), |mut acc, (i, s)| {
-        if i > 0 { acc.push_str(join); }
-        acc.push_str(s.as_ref());
-        acc
-    })
-}
diff --git a/components/util/tid.rs b/components/util/tid.rs
deleted file mode 100644
index a60c321a984..00000000000
--- a/components/util/tid.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use std::cell::RefCell;
-use std::rc::Rc;
-use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize, Ordering};
-
-static NEXT_TID: AtomicUsize = ATOMIC_USIZE_INIT;
-
-thread_local!(static TASK_LOCAL_TID: Rc<RefCell<Option<usize>>> = Rc::new(RefCell::new(None)));
-
-/// Every thread gets one, that's unique.
-pub fn tid() -> usize {
-    TASK_LOCAL_TID.with(|ref k| {
-        let ret =
-            match *k.borrow() {
-                None => NEXT_TID.fetch_add(1, Ordering::SeqCst),
-                Some(x) => x,
-            };
-
-        *k.borrow_mut() = Some(ret);
-
-        ret
-    })
-}