Update to Rust 2021 and use JsError from gloo-utils (#10)

* Update to Rust 2021 and use JsError from gloo-utils

* use new toolchain

Author: ranile

.github/workflows/ci.yml

@@ -16,6 +16,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          components: clippy
+          target: wasm32-unknown-unknown
+
       - uses: actions/cache@v2
         with:
           path: |
@@ -77,6 +84,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          components: clippy
+          target: wasm32-unknown-unknown
+
 
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

Cargo.toml

@@ -2,7 +2,7 @@
 name = "reqwasm"
 version = "0.2.1"
 authors = ["Hamza <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/hamza1311/reqwasm"
 description = "HTTP requests library for WASM Apps"
@@ -19,9 +19,9 @@ js-sys = "0.3"
 wasm-bindgen-futures = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-anyhow = "1.0"
 thiserror = "1.0"
 futures = "0.3.14"
+gloo-utils = "0.1.0"
 
 async-broadcast = "0.3"
 pin-project = "1"

src/error.rs

@@ -1,20 +1,6 @@
-use std::fmt;
+use gloo_utils::errors::JsError;
 use thiserror::Error as ThisError;
-use wasm_bindgen::{JsCast, JsValue};
-
-#[derive(Debug, Clone)]
-#[doc(hidden)]
-pub struct JsError {
-    pub name: String,
-    pub message: String,
-    js_to_string: String,
-}
-
-impl fmt::Display for JsError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.js_to_string)
-    }
-}
+use wasm_bindgen::JsValue;
 
 /// All the errors returned by this crate.
 #[derive(Debug, ThisError)]
@@ -29,22 +15,15 @@ pub enum Error {
         #[from]
         serde_json::Error,
     ),
-    /// Unknown error.
-    #[error("{0}")]
-    Other(anyhow::Error),
 }
 
 pub(crate) fn js_to_error(js_value: JsValue) -> Error {
     Error::JsError(js_to_js_error(js_value))
 }
 
 pub(crate) fn js_to_js_error(js_value: JsValue) -> JsError {
-    match js_value.dyn_into::<js_sys::Error>() {
-        Ok(error) => JsError {
-            name: String::from(error.name()),
-            message: String::from(error.message()),
-            js_to_string: String::from(error.to_string()),
-        },
+    match JsError::try_from(js_value) {
+        Ok(error) => error,
         Err(_) => unreachable!("JsValue passed is not an Error type -- this is a bug"),
     }
 }

src/http.rs

@@ -163,7 +163,7 @@ impl Request {
             Ok(response) => Ok(Response {
                 response: response.unchecked_into(),
             }),
-            Err(_) => Err(Error::Other(anyhow::anyhow!("can't convert to Response"))),
+            Err(e) => panic!("fetch returned {:?}, not `Response` - this is a bug", e),
         }
     }
 

src/websocket/futures.rs

@@ -29,14 +29,15 @@
 //! })
 //! # }
 //! ```
+use crate::js_to_js_error;
 use crate::websocket::{
     events::{CloseEvent, ErrorEvent},
     Message, State, WebSocketError,
 };
-use crate::{js_to_js_error, JsError};
 use async_broadcast::Receiver;
 use futures::ready;
 use futures::{Sink, Stream};
+use gloo_utils::errors::JsError;
 use pin_project::{pin_project, pinned_drop};
 use std::cell::RefCell;
 use std::pin::Pin;

src/websocket/mod.rs

@@ -6,8 +6,8 @@
 pub mod events;
 pub mod futures;
 
-use crate::JsError;
 use events::{CloseEvent, ErrorEvent};
+use gloo_utils::errors::JsError;
 use std::fmt;
 
 /// Message sent to and received from WebSocket.