Improved temporary variable names in generated JS

Author: RunDevelopment

crates/cli-support/src/js/binding.rs

@@ -170,9 +170,9 @@ export class Foo {
      * @param {string | undefined} [value]
      */
     set weird(value) {
-        var ptr0 = isLikeNone(value) ? 0 : passStringToWasm0(value, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        var len0 = WASM_VECTOR_LEN;
-        wasm.foo_set_weird(this.__wbg_ptr, ptr0, len0);
+        const ptr = isLikeNone(value) ? 0 : passStringToWasm0(value, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len = WASM_VECTOR_LEN;
+        wasm.foo_set_weird(this.__wbg_ptr, ptr, len);
     }
     /**
      * There can be static getters and setters too, and they can even have the

crates/cli/tests/reference/getter-setter.js

@@ -56,21 +56,19 @@ function takeObject(idx) {
  * @returns {string}
  */
 export function result_string() {
-    let deferred2_0;
-    let deferred2_1;
     try {
         const ret = wasm.result_string();
-        var ptr1 = ret[0];
-        var len1 = ret[1];
+        var ptr = ret[0];
+        var len = ret[1];
         if (ret[3]) {
-            ptr1 = 0; len1 = 0;
+            ptr = 0; len = 0;
             throw takeObject(ret[2]);
         }
-        deferred2_0 = ptr1;
-        deferred2_1 = len1;
-        return getStringFromWasm0(ptr1, len1);
+        var deferred0 = ptr;
+        var deferred1 = len;
+        return getStringFromWasm0(ptr, len);
     } finally {
-        wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
+        wasm.__wbindgen_free(deferred0, deferred1, 1);
     }
 }
 

crates/cli/tests/reference/result.js

@@ -1,3 +1,4 @@
 /* tslint:disable */
 /* eslint-disable */
 export function foo(a: string): void;
+export function bar(a: string, b: string, ptr: number, len: number): string;

crates/cli/tests/reference/string-arg.d.ts

@@ -85,9 +85,31 @@ function passStringToWasm0(arg, malloc, realloc) {
  * @param {string} a
  */
 export function foo(a) {
-    const ptr0 = passStringToWasm0(a, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    wasm.foo(ptr0, len0);
+    const ptr = passStringToWasm0(a, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len = WASM_VECTOR_LEN;
+    wasm.foo(ptr, len);
+}
+
+/**
+ * @param {string} a
+ * @param {string} b
+ * @param {number} ptr
+ * @param {number} len
+ * @returns {string}
+ */
+export function bar(a, b, ptr, len) {
+    try {
+        const ptr1 = passStringToWasm0(a, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len2 = WASM_VECTOR_LEN;
+        const ptr3 = passStringToWasm0(b, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len4 = WASM_VECTOR_LEN;
+        const ret = wasm.bar(ptr1, len2, ptr3, len4, ptr, len);
+        var deferred0 = ret[0];
+        var deferred1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred0, deferred1, 1);
+    }
 }
 
 export function __wbindgen_throw(arg0, arg1) {

crates/cli/tests/reference/string-arg.js

@@ -4,3 +4,8 @@ use wasm_bindgen::prelude::*;
 pub fn foo(a: &str) {
     drop(a);
 }
+
+#[wasm_bindgen]
+pub fn bar(a: &str, b: String, ptr: u32, len: u32) -> String {
+    b
+}

crates/cli/tests/reference/string-arg.rs

@@ -1,15 +1,21 @@
 (module $reference_test.wasm
   (type (;0;) (func (param i32 i32)))
   (type (;1;) (func (param i32 i32) (result i32)))
-  (type (;2;) (func (param i32 i32 i32 i32) (result i32)))
-  (func $__wbindgen_realloc (;0;) (type 2) (param i32 i32 i32 i32) (result i32))
+  (type (;2;) (func (param i32 i32 i32)))
+  (type (;3;) (func (param i32 i32 i32 i32) (result i32)))
+  (type (;4;) (func (param i32 i32 i32 i32 i32 i32) (result i32 i32)))
+  (func $__wbindgen_realloc (;0;) (type 3) (param i32 i32 i32 i32) (result i32))
   (func $__wbindgen_malloc (;1;) (type 1) (param i32 i32) (result i32))
   (func $foo (;2;) (type 0) (param i32 i32))
+  (func $__wbindgen_free (;3;) (type 2) (param i32 i32 i32))
+  (func $"bar multivalue shim" (;4;) (type 4) (param i32 i32 i32 i32 i32 i32) (result i32 i32))
   (memory (;0;) 17)
   (export "memory" (memory 0))
   (export "foo" (func $foo))
+  (export "bar" (func $"bar multivalue shim"))
   (export "__wbindgen_malloc" (func $__wbindgen_malloc))
   (export "__wbindgen_realloc" (func $__wbindgen_realloc))
+  (export "__wbindgen_free" (func $__wbindgen_free))
   (@custom "target_features" (after code) "\04+\0amultivalue+\0fmutable-globals+\0freference-types+\08sign-ext")
 )
 

crates/cli/tests/reference/string-arg.wat

@@ -81,17 +81,15 @@ function passStringToWasm0(arg, malloc, realloc) {
  * @returns {string}
  */
 export function example(a, b, c, d) {
-    let deferred2_0;
-    let deferred2_1;
     try {
-        const ptr0 = passStringToWasm0(d, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.example(a, b, c, ptr0, len0);
-        deferred2_0 = ret[0];
-        deferred2_1 = ret[1];
+        const ptr = passStringToWasm0(d, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len = WASM_VECTOR_LEN;
+        const ret = wasm.example(a, b, c, ptr, len);
+        var deferred0 = ret[0];
+        var deferred1 = ret[1];
         return getStringFromWasm0(ret[0], ret[1]);
     } finally {
-        wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
+        wasm.__wbindgen_free(deferred0, deferred1, 1);
     }
 }
 

crates/cli/tests/reference/wasm-export-types.js

@@ -217,10 +217,10 @@ export function __wbg_new_561a91ce53f10a66() { return handleError(function (arg0
 
 export function __wbindgen_debug_string(arg0, arg1) {
     const ret = debugString(getObject(arg1));
-    const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len1 = WASM_VECTOR_LEN;
-    getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
-    getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+    const ptr = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len = WASM_VECTOR_LEN;
+    getDataViewMemory0().setInt32(arg0 + 4 * 1, len, true);
+    getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr, true);
 };
 
 export function __wbindgen_object_drop_ref(arg0) {