Merge branch 'master' into evgenii/infromative_change_error

vsubhuman · web-flow · commit 48f90fdc46b0 · 2022-09-12T13:30:27.000+03:00
diff --git a/rust/src/error.rs b/rust/src/error.rs
@@ -130,6 +130,9 @@ impl std::fmt::Display for DeserializeError {
     }
 }
 
+#[cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))]
+impl std::error::Error for DeserializeError {}
+
 impl From<DeserializeError> for JsError {
     fn from(e: DeserializeError) -> JsError {
         JsError::from_str(&e.to_string())
@@ -202,3 +205,6 @@ impl std::fmt::Display for JsError {
         write!(f, "{}", self.msg)
     }
 }
+
+#[cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))]
+impl std::error::Error for JsError {}

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,9 @@ impl std::fmt::Display for DeserializeError {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
	`133`	`+#[cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))]`
	`134`	`+impl std::error::Error for DeserializeError {}`
	`135`	`+`
`133`	`136`	`impl From<DeserializeError> for JsError {`
`134`	`137`	`fn from(e: DeserializeError) -> JsError {`
`135`	`138`	`JsError::from_str(&e.to_string())`
`@@ -202,3 +205,6 @@ impl std::fmt::Display for JsError {`
`202`	`205`	`write!(f, "{}", self.msg)`
`203`	`206`	`}`
`204`	`207`	`}`
	`208`	`+`
	`209`	`+#[cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))]`
	`210`	`+impl std::error::Error for JsError {}`