diff --git a/examples/raytrace-parallel/Cargo.toml b/examples/raytrace-parallel/Cargo.toml index ae397f2b..d4747689 100644 --- a/examples/raytrace-parallel/Cargo.toml +++ b/examples/raytrace-parallel/Cargo.toml @@ -2,6 +2,7 @@ name = "raytrace-parallel" version = "0.1.0" authors = ["The wasm-bindgen Developers"] +edition = "2018" [lib] crate-type = ["cdylib"] diff --git a/examples/raytrace-parallel/src/lib.rs b/examples/raytrace-parallel/src/lib.rs index 708d27ce..7db52101 100644 --- a/examples/raytrace-parallel/src/lib.rs +++ b/examples/raytrace-parallel/src/lib.rs @@ -1,9 +1,3 @@ -extern crate futures; -extern crate js_sys; -extern crate raytracer; -extern crate wasm_bindgen; -extern crate web_sys; - use std::cell::RefCell; use std::cmp; use std::rc::Rc; @@ -88,7 +82,7 @@ impl Scene { } } Ok(()) - }) as Box Result<(), JsValue>>); + }) as Box Result<(), JsValue>>); for worker in &pool.workers[..concurrency] { let ptr_to_send = Arc::into_raw(r.shared.clone()) as u32; @@ -112,7 +106,7 @@ impl Scene { #[wasm_bindgen] pub struct WorkerPool { workers: Vec, - callback: Closure, + callback: Closure, } #[wasm_bindgen] @@ -193,7 +187,7 @@ impl RenderingScene { } struct Render { - callback: Option Result<(), JsValue>>>, + callback: Option Result<(), JsValue>>>, tx: Option>, shared: Arc, ctx: CanvasRenderingContext2d, @@ -326,7 +320,7 @@ impl Shared { fn update_image( &self, done: bool, - data: MutexGuard>, + data: MutexGuard<'_,Vec>, global: &DedicatedWorkerGlobalScope, ) -> Result<(), JsValue> { // This is pretty icky. We can't create an `ImageData` backed by