Merge pull request #236 from gents83/patch-1

fintelia · web-flow · commit d567e43e6485 · 2022-04-30T18:12:21.000-07:00
Fixing issue with worker on wasm targets
diff --git a/src/worker/mod.rs b/src/worker/mod.rs
@@ -34,14 +34,15 @@ pub enum PreferWorkerKind {
     Multithreaded,
 }
 
+
 /// Execute something with a worker system.
 pub fn with_worker<T>(prefer: PreferWorkerKind, f: impl FnOnce(&mut dyn Worker) -> T) -> T {
     match prefer {
-        #[cfg(not(any(target_arch = "asmjs", target_arch = "wasm32")))]
-        #[cfg(feature = "rayon")]
+        #[cfg(all(not(any(target_arch = "asmjs", target_arch = "wasm32")), feature = "rayon"))]
         PreferWorkerKind::Multithreaded => self::rayon::with_rayon(f),
         #[cfg(not(any(target_arch = "asmjs", target_arch = "wasm32")))]
         PreferWorkerKind::Multithreaded => self::multithreaded::with_multithreading(f),
         _ => self::immediate::with_immediate(f),
     }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -34,14 +34,15 @@ pub enum PreferWorkerKind {`
`34`	`34`	`Multithreaded,`
`35`	`35`	`}`
`36`	`36`
	`37`	`+`
`37`	`38`	`/// Execute something with a worker system.`
`38`	`39`	`pub fn with_worker<T>(prefer: PreferWorkerKind, f: impl FnOnce(&mut dyn Worker) -> T) -> T {`
`39`	`40`	`match prefer {`
`40`		`- #[cfg(not(any(target_arch = "asmjs", target_arch = "wasm32")))]`
`41`		`- #[cfg(feature = "rayon")]`
	`41`	`+ #[cfg(all(not(any(target_arch = "asmjs", target_arch = "wasm32")), feature = "rayon"))]`
`42`	`42`	`PreferWorkerKind::Multithreaded => self::rayon::with_rayon(f),`
`43`	`43`	`#[cfg(not(any(target_arch = "asmjs", target_arch = "wasm32")))]`
`44`	`44`	`PreferWorkerKind::Multithreaded => self::multithreaded::with_multithreading(f),`
`45`	`45`	`_ => self::immediate::with_immediate(f),`
`46`	`46`	`}`
`47`	`47`	`}`
	`48`	`+`