From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 12 Oct 2020 10:41:12 +0000 (+0100)
Subject: console_error_panic_hook
X-Git-Tag: otter-0.2.0~661
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dff2f6a0166666554b2ba7851b69ed45d719e02b;p=otter.git

console_error_panic_hook

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Cargo.lock.example b/Cargo.lock.example
index e7a7636a..9ead7f9f 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -229,6 +229,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "cookie"
 version = "0.11.3"
@@ -262,7 +272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
 dependencies = [
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -273,7 +283,7 @@ checksum = "12e531288b600a8bea48baff926d2f16a3f68fda1cd2d59240279907ba727332"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -366,7 +376,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
  "synstructure",
 ]
 
@@ -393,7 +403,7 @@ checksum = "ccb5acb1045ebbfa222e2c50679e392a71dd77030b78fb0189f2d9c5974400f9"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -508,7 +518,7 @@ checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -699,7 +709,7 @@ checksum = "ddead8880bc50f57fcd3b5869a7f6ff92570bb4e8f6870c22e2483272f2256da"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -1012,6 +1022,7 @@ dependencies = [
 name = "otter-wasm"
 version = "0.0.1"
 dependencies = [
+ "console_error_panic_hook",
  "fehler",
  "js-sys",
  "otter-zcoord",
@@ -1092,7 +1103,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -1251,7 +1262,7 @@ checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -1400,7 +1411,7 @@ checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -1505,9 +1516,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2e59c50ed8f6b050b071aa7b6865293957a9af6b58b94f97c1c9434ad440ea"
+checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -1522,7 +1533,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
  "unicode-xid 0.2.1",
 ]
 
@@ -1564,7 +1575,7 @@ checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -1650,7 +1661,7 @@ checksum = "3f2466fc87b07b800a5060f89ba579d6882f7a03ac21363e4737764aaf9f99f9"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
 ]
 
 [[package]]
@@ -1873,7 +1884,7 @@ dependencies = [
  "log 0.4.11",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
  "wasm-bindgen-shared",
 ]
 
@@ -1895,7 +1906,7 @@ checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.43",
+ "syn 1.0.44",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
diff --git a/templates/script.ts b/templates/script.ts
index ec7e0124..e4ada295 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -1013,7 +1013,7 @@ function test_swap_stack() {
 
 function startup() {
   console.log('STARTUP');
-  console.log(wasm_bindgen.canary("OK"));
+  console.log(wasm_bindgen.setup("OK"));
 
   var body = document.getElementById("main-body")!;
   ctoken = body.dataset.ctoken!;
diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
index cffff750..7cb2a1b6 100644
--- a/wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -19,4 +19,4 @@ js-sys = "0.3"
 fehler = "1"
 thiserror = "1"
 wee_alloc = "0.4"
-#wee_alloc = { version = "0.4.5", optional = true }
+console_error_panic_hook = "0.1"
diff --git a/wasm/wasm.rs b/wasm/wasm.rs
index 8c25c5a1..f1f9f6e8 100644
--- a/wasm/wasm.rs
+++ b/wasm/wasm.rs
@@ -81,9 +81,10 @@ impl ZCoordIterator {
 }
 
 #[wasm_bindgen]
-pub fn canary(s: &str) -> JsString {
+pub fn setup(s: &str) -> JsString {
   // returning String produces a wasm-opt error, as here
   //  https://github.com/WebAssembly/binaryen/issues/3006
+  console_error_panic_hook::set_once();
   format!("WASM {}", s).into()
 }