Update to modern wasm-bindgen

This involves
 * Cargo.toml update to unpin the version
 * Cargo.lock update, consequential
 * Get rid of our ad-hoc kludge to get the wasm object into script.ts

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

diff --git a/Cargo.lock b/Cargo.lock
index 118327531e52d817d13ddb9f17024d8264b9c5b4..305dc2a6c6eac5d3c9b338372241af724d1f1942 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1544,9 +1544,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "js-sys"
-version = "0.3.47"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cfb73131c35423a367daf8cbd24100af0d077668c8c2943f0e7dd775fef0f65"
+checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -4108,9 +4108,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be"
+checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -4120,9 +4120,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc45447f0d4573f3d65720f636bbcc3dd6ce920ed704670118650bcd47764c7"
+checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -4135,9 +4135,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-cli"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6f3c426870da6df3c4ba8425e8c1d5209db992649abeaa0223c76a38070b101"
+checksum = "e742d19ccb940d708e99533dee0fe2bd2f032daf99d5dd71552350cc694fd925"
 dependencies = [
  "anyhow",
  "curl",
@@ -4155,9 +4155,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-cli-support"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2499b60d96e1c1680913abb79146040af534b45063ddac03b9d7d7f9746a4a7"
+checksum = "b8b82b211f45fc23ed2a5f45bbc9404182e959c28275cf2ac81d724dffcf28f5"
 dependencies = [
  "anyhow",
  "base64 0.9.3",
@@ -4179,9 +4179,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-externref-xform"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e0c97b4830d251b78bae69444e97631e0155bf45f10ce20898e41ed117b2f83"
+checksum = "fb9fc31107ec61d6b82adad6a6b658ecab3dfa3161071b0c843dce375e4e6293"
 dependencies = [
  "anyhow",
  "walrus",
@@ -4189,9 +4189,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.20"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de431a2910c86679c34283a33f66f4e4abd7e0aec27b6669060148872aadf94"
+checksum = "73157efb9af26fb564bb59a009afd1c7c334a44db171d280690d0c3faaec3468"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -4201,9 +4201,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c"
+checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b"
 dependencies = [
  "quote 1.0.9",
  "wasm-bindgen-macro-support",
@@ -4211,9 +4211,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385"
+checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.9",
@@ -4224,9 +4224,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-multi-value-xform"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a2528cf01bc8b7aaca37579107cae12a1fe0ca163dec9c0ed324767534e0695"
+checksum = "d9c356578a8e6c28b55fa89af466894935c559b69439c4b9fde1a93ba8db95e8"
 dependencies = [
  "anyhow",
  "walrus",
@@ -4234,15 +4234,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"
+checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa"
 
 [[package]]
 name = "wasm-bindgen-threads-xform"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43d48adbf863f316c8022fbe2021ffd2dc7d761b1108fe1473dfd067bc13cc9"
+checksum = "264c6556a39e7d07befbc1ff377c4d9bcb1430b7ec06f6645f065b3700533186"
 dependencies = [
  "anyhow",
  "walrus",
@@ -4251,9 +4251,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-wasm-conventions"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f70056a013a1a7fac56bc25d26a666f531a984b85169d41e392ace89a806c7ee"
+checksum = "5bd3d7e5ff7c79222eca344fc031ec2d67780bc21ab477cd5c3dce06ce20ba68"
 dependencies = [
  "anyhow",
  "walrus",
@@ -4261,9 +4261,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-wasm-interpreter"
-version = "0.2.70"
+version = "0.2.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957c775a2994b6978790770052e17ec487e75e72b237a78df24f4d978fa6acbc"
+checksum = "9f7b9ebf2992426faf86a58bf679855243d061c2a08857cacde4d0518b3755c7"
 dependencies = [
  "anyhow",
  "log 0.4.14",
@@ -4288,9 +4288,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.47"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c40dc691fc48003eba817c38da7113c15698142da971298003cac3ef175680b3"
+checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310"
 dependencies = [
  "js-sys",
  "wasm-bindgen",

diff --git a/Makefile b/Makefile
index ad6ff3643874c3aca975743a533660764798c925..bdb513280a503444e0772ce64036ca258d8e00b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ TS_SRCS= script
 TS_SRC_FILES= \
        $(addprefix templates/,$(addsuffix .ts,$(TS_SRCS))) \
        webassembly-types/webassembly.d.ts \
-       templates/otter_wasm.ns.d.ts
+       $(WASM_PACKED)/otter_wasm.d.ts
 
 LITFILES= LICENCE AGPLv3
 TXTFILES= CC-BY-SA-3.0 CC-BY-SA-4.0
@@ -270,15 +270,7 @@ library/%/files.make: media-scraper library/%.toml
 templates/%.js: tsc-wrap tsconfig.json
        ./tsc-wrap $@ tsconfig.json $(filter %.ts,$^)
 
-templates/script.js: $(TS_SRC_FILES)
-
-templates/otter_wasm.ns.d.ts: $(WASM_PACKED)/otter_wasm.d.ts \
-                               stamp/wasm-bindgen $(MAKEFILE_DEP)
-       set -e; exec >$@.tmp;                           \
-       echo 'declare namespace wasm_bindgen {';        \
-       sed 's/^export default function init/export function init/' <$<; \
-       echo '}'
-       mv -v $@.tmp $@
+templates/script.js: $(TS_SRC_FILES) stamp/wasm-bindgen
 
 #---------- other templates ----------
 

diff --git a/templates/script.ts b/templates/script.ts
index e1bfc17e7faa85f70632a8e7d347abdb7d4e0650..b14f9d149de3472dada5ebb412df603daa81879a 100644 (file)
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -79,7 +79,7 @@ type PieceInfo = {
   last_seen_moved : DOMHighResTimeStamp | null, // non-0 means halo'd
 }
 
-let wasm : wasm_bindgen.InitOutput;
+let wasm : InitOutput;
 
 var pieces : { [piece: string]: PieceInfo } = Object.create(null);
 

diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
index ad82f719f4bff577850f46bd439a4c0d6a3ac5ce..1bff9257a3c0d3e1561f52ded0fc2aaef87ebb2d 100644 (file)
--- a/wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -5,9 +5,9 @@ fehler="1"
 js-sys="0.3"
 wee_alloc="0.4"
 
-wasm-bindgen = "0.2.70"
+wasm-bindgen = "0.2"
 [build-dependencies]
-wasm-bindgen-cli = "0.2.70"
+wasm-bindgen-cli = "0.2"
 
 [dependencies.otter-base]
 path="../base"