Merge branch 'master' into oxilangtag

.github/workflows/test.yml

@@ -17,8 +17,8 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
       - run: |
           rustup toolchain install stable
-          cargo fmt --all --check
-          cargo clippy --all-features
+          cargo fmt --check
+          cargo clippy
 
   check_web:
     name: Check Web
@@ -26,10 +26,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: |
-          rustup toolchain install stable
           rustup target add wasm32-unknown-unknown
+          rustup toolchain install stable
           cargo fmt --all --check
-          cargo clippy --all-features --target wasm32-unknown-unknown
+          cargo clippy --target wasm32-unknown-unknown
 
   check_android:
     name: Check Android
@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: |
-          rustup toolchain install stable
           rustup target add wasm32-unknown-unknown
-          cargo install cargo-make
-          cargo make build-web-example
+          rustup toolchain install stable
+          cd examples/web
+          cargo build --target wasm32-unknown-unknown

examples/android/cargo.toml

@@ -2,7 +2,7 @@
 name = "hello_world"
 version = "0.1.0"
 authors = ["Nolan Darilek <nolan@thewordnerd.info>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

examples/web/Cargo.toml

@@ -2,7 +2,7 @@
 name = "web"
 version = "0.1.0"
 authors = ["Nolan Darilek <nolan@thewordnerd.info>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -11,4 +11,3 @@ console_log = "0.2"
 log = "0.4"
 seed = "0.9"
 tts = { path = "../.." }
-wasm-bindgen = "0.2"