update for new version (doesn't really matter though)

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "mixsy"
 description = "combine Bitsy games"
-version = "0.72.0"
+version = "0.710.0"
 authors = ["Max Bradbury <max@tinybird.info>"]
 edition = "2018"
 license = "MIT"
@@ -13,6 +13,6 @@ repository = "https://tinybird.dev/max/mixsy"
 crate-type = ["cdylib"]
 
 [dependencies]
-"bitsy-parser" = "^0.72.0"
+"bitsy-parser" = "^0.710.0"
 "lazy_static"  = "^1.4.0"
-"wasm-bindgen" = "^0.2.64"
+"wasm-bindgen" = "^0.2.78"

build.sh

@@ -2,5 +2,4 @@
 
 cargo build
 pug index.pug
-set -ex
 wasm-pack build --target web

deploy.sh

@@ -1,6 +1,4 @@
 #!/bin/sh
 
-./build.sh
-
 zip -r mixsy.zip README.md index.html merge.png pkg
 butler push mixsy.zip ruin/mixsy:html

index.pug

@@ -27,6 +27,5 @@ html(lang="en-gb")
                 .square.centre
                     h2 output
                     textarea#c
-        //- Note the usage of `type=module` here as this is an ES6 module -->
         script(type="module")
             include index.js

src/lib.rs

@@ -16,10 +16,11 @@ lazy_static! {
 
 #[wasm_bindgen]
 pub fn load_main(game_data: String) -> String {
-    let game = Game::from(game_data);
+    let result = Game::from(game_data);
 
-    if game.is_ok() {
+    if result.is_ok() {
-        STATE.lock().unwrap().main = Some(game.unwrap());
+        let (game, _errors) = result.unwrap();
+        STATE.lock().unwrap().main = Some(game);
         "OK!"
     } else {
         "Could not parse game data"
@@ -28,10 +29,11 @@ pub fn load_main(game_data: String) -> String {
 
 #[wasm_bindgen]
 pub fn load_additional(game_data: String) -> String {
-    let game = Game::from(game_data);
+    let result = Game::from(game_data);
 
-    if game.is_ok() {
+    if result.is_ok() {
-        STATE.lock().unwrap().additional = Some(game.unwrap());
+        let (game, _errors) = result.unwrap();
+        STATE.lock().unwrap().additional = Some(game);
         "OK!"
     } else {
         "Could not parse game data"
@@ -47,7 +49,8 @@ pub fn merge() -> String {
     }
 
     let mut main = state.main.clone().unwrap();
-    let additional = state.additional.clone().unwrap();
+    let additional = state.additional.as_ref().unwrap();
+
     main.merge(additional);
     main.dedupe_tiles();
     main.to_string()