bump required rayon version to 0.7

...and bring jpeg-decoder along for the ride. Minor tweaks were necessary because of rayon API changes.
servo · May 5, 2017 · 681b578 · 681b578
1 parent 7fc0143
commit 681b578
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
@@ -30,7 +30,7 @@ ordered-float = "0.4"
 parking_lot = "0.3.3"
 profile_traits = {path = "../profile_traits"}
 range = {path = "../range"}
-rayon = "0.6"
+rayon = "0.7"
 script_layout_interface = {path = "../script_layout_interface"}
 script_traits = {path = "../script_traits"}
 selectors = { path = "../selectors" }

diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
@@ -25,7 +25,7 @@ msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 parking_lot = {version = "0.3.3", features = ["nightly"]}
 profile_traits = {path = "../profile_traits"}
-rayon = "0.6"
+rayon = "0.7"
 script = {path = "../script"}
 script_layout_interface = {path = "../script_layout_interface"}
 script_traits = {path = "../script_traits"}

diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs
@@ -398,7 +398,7 @@ impl LayoutThread {
             opts::get().initial_window_size.to_f32() * ScaleFactor::new(1.0));
 
         let configuration =
-            rayon::Configuration::new().set_num_threads(layout_threads);
+            rayon::Configuration::new().num_threads(layout_threads);
         let parallel_traversal = rayon::ThreadPool::new(configuration).ok();
         debug!("Possible layout Threads: {}", layout_threads);
 

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
@@ -47,7 +47,7 @@ ordered-float = "0.4"
 parking_lot = "0.3.3"
 pdqsort = "0.1.0"
 precomputed-hash = "0.1"
-rayon = "0.6"
+rayon = "0.7"
 selectors = { path = "../selectors" }
 serde = {version = "0.9", optional = true}
 serde_derive = {version = "0.9", optional = true}

diff --git a/components/style/gecko/global_style_data.rs b/components/style/gecko/global_style_data.rs
@@ -40,7 +40,7 @@ lazy_static! {
             None
         } else {
             let configuration =
-                rayon::Configuration::new().set_num_threads(num_threads);
+                rayon::Configuration::new().num_threads(num_threads);
             let pool = rayon::ThreadPool::new(configuration).ok();
             pool
         };

diff --git a/components/style/scoped_tls.rs b/components/style/scoped_tls.rs
@@ -27,7 +27,7 @@ impl<'scope, T: Send> ScopedTLS<'scope, T> {
     /// Create a new scoped TLS that will last as long as this rayon threadpool
     /// reference.
     pub fn new(p: &'scope rayon::ThreadPool) -> Self {
-        let count = p.num_threads();
+        let count = p.current_num_threads();
         let mut v = Vec::with_capacity(count);
         for _ in 0..count {
             v.push(RefCell::new(None));

diff --git a/servo-tidy.toml b/servo-tidy.toml
@@ -20,6 +20,7 @@ rand = [
   "parking_lot_core",
   "phf_generator",
   "rayon",
+  "rayon-core",
   "servo_rand",
   "servo-websocket",
   "tempdir",

diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
@@ -19,7 +19,7 @@ cssparser = "0.13"
 euclid = "0.11"
 html5ever = "0.16"
 parking_lot = "0.3"
-rayon = "0.6"
+rayon = "0.7"
 rustc-serialize = "0.3"
 selectors = {path = "../../../components/selectors"}
 servo_atoms = {path = "../../../components/atoms"}