From 69e0d6c8bd87472a165668fc71bb05a9945fd39c Mon Sep 17 00:00:00 2001 From: sobolevn Date: Mon, 21 Jul 2025 18:51:25 +0300 Subject: [PATCH] gh-136938: Do not use `var` in js, use `let` and `const` --- Python/emscripten_syscalls.c | 24 ++++++++++++------------ Python/sysmodule.c | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Python/emscripten_syscalls.c b/Python/emscripten_syscalls.c index d3eedad30e3639..01e5e1fc74b4b5 100644 --- a/Python/emscripten_syscalls.c +++ b/Python/emscripten_syscalls.c @@ -55,12 +55,12 @@ EM_JS_MACROS(void, _emscripten_promising_main_js, (void), { // `createAsyncInputDevice` simpler, and everything faster. FS.createAsyncInputDevice = function(parent, name, input) { parent = typeof parent == 'string' ? parent : FS.getPath(parent); - var path = PATH.join2(parent, name); - var mode = FS_getMode(true, false); + const path = PATH.join2(parent, name); + const mode = FS_getMode(true, false); FS.createDevice.major ||= 64; - var dev = FS.makedev(FS.createDevice.major++, 0); + const dev = FS.makedev(FS.createDevice.major++, 0); async function getDataBuf() { - var buf; + let buf; try { buf = await input(); } catch (e) { @@ -72,7 +72,7 @@ EM_JS_MACROS(void, _emscripten_promising_main_js, (void), { ops._dataBuf = buf; } - var ops = { + const ops = { _dataBuf: new Uint8Array(0), open(stream) { stream.seekable = false; @@ -82,7 +82,7 @@ EM_JS_MACROS(void, _emscripten_promising_main_js, (void), { if (!ops._dataBuf.byteLength) { await getDataBuf(); } - var toRead = Math.min(ops._dataBuf.byteLength, buffer.byteLength); + const toRead = Math.min(ops._dataBuf.byteLength, buffer.byteLength); buffer.subarray(0, toRead).set(ops._dataBuf); buffer = buffer.subarray(toRead); ops._dataBuf = ops._dataBuf.subarray(toRead); @@ -151,7 +151,7 @@ EM_JS_MACROS(__externref_t, __maybe_fd_read_async, ( if (!WebAssembly.promising) { return null; } - var stream; + let stream; try { stream = SYSCALLS.getStreamFromFD(fd); } catch (e) { @@ -169,12 +169,12 @@ EM_JS_MACROS(__externref_t, __maybe_fd_read_async, ( // https://github.com/emscripten-core/emscripten/blob/4.0.11/src/lib/libwasi.js?plain=1#L331 // https://github.com/emscripten-core/emscripten/blob/4.0.11/src/lib/libwasi.js?plain=1#L197 try { - var ret = 0; - for (var i = 0; i < iovcnt; i++) { - var ptr = HEAP32[(iovs + IOVEC_T_BUF_OFFSET)/4]; - var len = HEAP32[(iovs + IOVEC_T_BUF_LEN_OFFSET)/4]; + let ret = 0; + for (let i = 0; i < iovcnt; i++) { + const ptr = HEAP32[(iovs + IOVEC_T_BUF_OFFSET)/4]; + const len = HEAP32[(iovs + IOVEC_T_BUF_LEN_OFFSET)/4]; iovs += IOVEC_T_SIZE; - var curr = await stream.stream_ops.readAsync(stream, HEAP8, ptr, len); + const curr = await stream.stream_ops.readAsync(stream, HEAP8, ptr, len); if (curr < 0) return -1; ret += curr; if (curr < len) break; // nothing more to read diff --git a/Python/sysmodule.c b/Python/sysmodule.c index ae6cf306735939..ef1cc6344b697d 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -3655,7 +3655,7 @@ static PyStructSequence_Desc emscripten_info_desc = { }; EM_JS(char *, _Py_emscripten_runtime, (void), { - var info; + let info; if (typeof navigator == 'object') { info = navigator.userAgent; } else if (typeof process == 'object') { @@ -3663,8 +3663,8 @@ EM_JS(char *, _Py_emscripten_runtime, (void), { } else { info = "UNKNOWN"; } - var len = lengthBytesUTF8(info) + 1; - var res = _malloc(len); + const len = lengthBytesUTF8(info) + 1; + const res = _malloc(len); if (res) stringToUTF8(info, res, len); #if __wasm64__ return BigInt(res);