diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index e75365fc3a7..33a3270c05c 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -2039,7 +2039,7 @@ dependencies = [ "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 6aee2f66cfd..7160f796fa4 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -34,7 +34,7 @@ heapsize_plugin = "0.1.2" lazy_static = "0.1.16" log = "0.3.5" matches = "0.1" -num = "0.1.24" +num-traits = "0.1.32" rustc-serialize = "0.3" selectors = {version = "0.5", features = ["heap_size", "unstable"]} serde = {version = "0.7", features = ["nightly"]} diff --git a/components/style/attr.rs b/components/style/attr.rs index 43652c3dc8a..363c5b44f52 100644 --- a/components/style/attr.rs +++ b/components/style/attr.rs @@ -5,7 +5,7 @@ use app_units::Au; use cssparser::{self, Color, RGBA}; use euclid::num::Zero; -use num::ToPrimitive; +use num_traits::ToPrimitive; use std::ascii::AsciiExt; use std::ops::Deref; use std::str::FromStr; diff --git a/components/style/lib.rs b/components/style/lib.rs index 951a32cd3ce..86e24be674d 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -34,7 +34,7 @@ extern crate lazy_static; extern crate log; #[macro_use] extern crate matches; -extern crate num; +extern crate num_traits; extern crate rustc_serialize; extern crate selectors; extern crate serde; diff --git a/components/style/viewport.rs b/components/style/viewport.rs index 2b5d9ea3175..2f8377102c9 100644 --- a/components/style/viewport.rs +++ b/components/style/viewport.rs @@ -512,7 +512,7 @@ impl MaybeNew for ViewportConstraints { rule: &ViewportRule) -> Option { - use num::{Float, ToPrimitive}; + use num_traits::{Float, ToPrimitive}; use std::cmp; if rule.declarations.is_empty() { diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b6dbfa5a0e4..309ef9907b3 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1942,7 +1942,7 @@ dependencies = [ "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index e2c17c41381..8b71f8bcc59 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -448,7 +448,7 @@ dependencies = [ "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 6c2aa7babef..79ed831c57e 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1922,7 +1922,7 @@ dependencies = [ "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",