Merge pull request #36 from rust-amplify/wasm

WASM support

Author: dr-orlovsky

.github/workflows/test.yml

@@ -40,3 +40,18 @@ jobs:
         run: rustup target add wasm32-unknown-unknown
       - name: Test in headless Chrome
         run: wasm-pack test --headless --chrome
+  wasm-dependency:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - uses: Swatinem/rust-cache@v2
+      - uses: jetli/wasm-pack-action@v0.3.0
+      - name: Add wasm32 target
+        run: rustup target add wasm32-unknown-unknown
+      - name: Test building dependency
+        run: cd test/wasm && wasm-pack build

.gitignore

@@ -1,6 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target
+target/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk

syn/src/attr.rs

@@ -538,7 +538,7 @@ impl ParametrizedAttr {
     /// fusion takes a nested meta data.
     #[inline]
     pub fn fuse(&mut self, attr: &Attribute) -> Result<(), Error> {
-        let args = MetaArgList::parse.parse(attr.tokens.clone().into())?;
+        let args = MetaArgList::parse.parse2(attr.tokens.clone().into())?;
         for arg in args.list {
             match arg {
                 // `#[ident("literal", ...)]`

syn/src/val.rs

@@ -118,7 +118,7 @@ impl From<Option<LitStr>> for ArgValue {
 
 impl From<Ident> for ArgValue {
     fn from(ident: Ident) -> Self {
-        Path::from(PathSegment::parse.parse(quote! { #ident }.into()).unwrap()).into()
+        Path::from(PathSegment::parse.parse2(quote! { #ident }.into()).unwrap()).into()
     }
 }
 
@@ -304,7 +304,7 @@ impl TryFrom<ArgValue> for Path {
     fn try_from(value: ArgValue) -> Result<Self, Self::Error> {
         match value {
             ArgValue::Expr(expr) => Path::parse
-                .parse(expr.to_token_stream().into())
+                .parse2(expr.to_token_stream().into())
                 .map_err(Error::from),
             ArgValue::Type(Type::Path(ty)) => Ok(ty.path),
             _ => Err(Error::ArgValueMustBeType),
@@ -318,10 +318,10 @@ impl TryFrom<ArgValue> for Expr {
     fn try_from(value: ArgValue) -> Result<Self, Self::Error> {
         match value {
             ArgValue::Literal(lit) => Expr::parse
-                .parse(lit.to_token_stream().into())
+                .parse2(lit.to_token_stream().into())
                 .map_err(Error::from),
             ArgValue::Type(ty) => Expr::parse
-                .parse(ty.to_token_stream().into())
+                .parse2(ty.to_token_stream().into())
                 .map_err(Error::from),
             ArgValue::Expr(expr) => Ok(expr),
             ArgValue::None => Err(Error::ArgValueMustBeExpr),
@@ -427,7 +427,7 @@ impl TryFrom<ArgValue> for Option<Path> {
             ArgValue::Type(Type::Path(ty)) => Ok(Some(ty.path)),
             ArgValue::Expr(expr) => Some(
                 Path::parse
-                    .parse(expr.into_token_stream().into())
+                    .parse2(expr.into_token_stream().into())
                     .map_err(Error::from),
             )
             .transpose(),
@@ -445,13 +445,13 @@ impl TryFrom<ArgValue> for Option<Expr> {
             ArgValue::Expr(expr) => Ok(Some(expr)),
             ArgValue::Type(ty) => Some(
                 Expr::parse
-                    .parse(ty.into_token_stream().into())
+                    .parse2(ty.into_token_stream().into())
                     .map_err(Error::from),
             )
             .transpose(),
             ArgValue::Literal(lit) => Some(
                 Expr::parse
-                    .parse(lit.into_token_stream().into())
+                    .parse2(lit.into_token_stream().into())
                     .map_err(Error::from),
             )
             .transpose(),

test/wasm/Cargo.lock

@@ -0,0 +1,14 @@
+[workspace]
+members = ["."]
+
+[package]
+name = "amplify_derive_wasm_test"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+amplify_derive = { path = "../.." }
+wasm-bindgen = "0.2.84"

test/wasm/Cargo.toml

@@ -0,0 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}