bump required rayon version to 0.7

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" }

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"}

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);
 

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}

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
         };

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));

etc/ci/buildbot_steps.yml

@@ -2,7 +2,7 @@ mac-rel-wpt1:
   - ./mach clean-nightlies --keep 3 --force
   - ./mach build --release
   - ./mach test-wpt-failure
-  - ./mach test-wpt --release --processes 8 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
+  - ./mach test-wpt --release --processes 4 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
   - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --use-tracker
   - ./mach test-wpt --release --binary-arg=--multiprocess --processes 8 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
   - ./mach build-cef --release
@@ -12,7 +12,7 @@ mac-rel-wpt1:
 mac-rel-wpt2:
   - ./mach clean-nightlies --keep 3 --force
   - ./mach build --release
-  - ./mach test-wpt --release --processes 8 --total-chunks 2 --this-chunk 2 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
+  - ./mach test-wpt --release --processes 4 --total-chunks 2 --this-chunk 2 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
   - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --use-tracker
   - ./mach build-geckolib --release
 

servo-tidy.toml

@@ -20,6 +20,7 @@ rand = [
   "parking_lot_core",
   "phf_generator",
   "rayon",
+  "rayon-core",
   "servo_rand",
   "servo-websocket",
   "tempdir",

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"}