Skip to content

Bump rayon to 0.8 #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2017
Merged

Bump rayon to 0.8 #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webrender/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ log = "0.3"
num-traits = "0.1.32"
offscreen_gl_context = {version = "0.9.0", features = ["serde", "osmesa"], optional = true}
time = "0.1"
rayon = {version = "0.7", features = ["unstable"]}
rayon = "0.8"
webrender_traits = {path = "../webrender_traits"}
bitflags = "0.7"
gamma-lut = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion webrender/examples/blob.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ impl wt::BlobImageRenderer for CheckerboardRenderer {
let tx = self.tx.clone();
let descriptor = descriptor.clone();

self.workers.spawn_async(move || {
self.workers.spawn(move || {
let result = render_blob(cmds, &descriptor, request.tile);
tx.send((request, result)).unwrap();
});
Expand Down
4 changes: 2 additions & 2 deletions webrender/src/glyph_rasterizer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ impl GlyphRasterizer {
// spawn an async task to get off of the render backend thread as early as
// possible and in that task use rayon's fork join dispatch to rasterize the
// glyphs in the thread pool.
self.workers.spawn_async(move || {
self.workers.spawn(move || {
let jobs = glyphs.par_iter().map(|request: &GlyphRequest| {
profile_scope!("glyph-raster");
let mut context = font_contexts.lock_current_context();
Expand Down Expand Up @@ -287,7 +287,7 @@ impl GlyphRasterizer {
if !self.fonts_to_remove.is_empty() {
let font_contexts = Arc::clone(&self.font_contexts);
let fonts_to_remove = mem::replace(&mut self.fonts_to_remove, Vec::new());
self.workers.spawn_async(move || {
self.workers.spawn(move || {
for font_key in &fonts_to_remove {
font_contexts.lock_shared_context().delete_font(font_key);
}
Expand Down