Skip to content

Commit 69e0d6c

Browse files
committed
gh-136938: Do not use var in js, use let and const
1 parent 5f9e38f commit 69e0d6c

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

Python/emscripten_syscalls.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ EM_JS_MACROS(void, _emscripten_promising_main_js, (void), {
5555
// `createAsyncInputDevice` simpler, and everything faster.
5656
FS.createAsyncInputDevice = function(parent, name, input) {
5757
parent = typeof parent == 'string' ? parent : FS.getPath(parent);
58-
var path = PATH.join2(parent, name);
59-
var mode = FS_getMode(true, false);
58+
const path = PATH.join2(parent, name);
59+
const mode = FS_getMode(true, false);
6060
FS.createDevice.major ||= 64;
61-
var dev = FS.makedev(FS.createDevice.major++, 0);
61+
const dev = FS.makedev(FS.createDevice.major++, 0);
6262
async function getDataBuf() {
63-
var buf;
63+
let buf;
6464
try {
6565
buf = await input();
6666
} catch (e) {
@@ -72,7 +72,7 @@ EM_JS_MACROS(void, _emscripten_promising_main_js, (void), {
7272
ops._dataBuf = buf;
7373
}
7474

75-
var ops = {
75+
const ops = {
7676
_dataBuf: new Uint8Array(0),
7777
open(stream) {
7878
stream.seekable = false;
@@ -82,7 +82,7 @@ EM_JS_MACROS(void, _emscripten_promising_main_js, (void), {
8282
if (!ops._dataBuf.byteLength) {
8383
await getDataBuf();
8484
}
85-
var toRead = Math.min(ops._dataBuf.byteLength, buffer.byteLength);
85+
const toRead = Math.min(ops._dataBuf.byteLength, buffer.byteLength);
8686
buffer.subarray(0, toRead).set(ops._dataBuf);
8787
buffer = buffer.subarray(toRead);
8888
ops._dataBuf = ops._dataBuf.subarray(toRead);
@@ -151,7 +151,7 @@ EM_JS_MACROS(__externref_t, __maybe_fd_read_async, (
151151
if (!WebAssembly.promising) {
152152
return null;
153153
}
154-
var stream;
154+
let stream;
155155
try {
156156
stream = SYSCALLS.getStreamFromFD(fd);
157157
} catch (e) {
@@ -169,12 +169,12 @@ EM_JS_MACROS(__externref_t, __maybe_fd_read_async, (
169169
// https://github.com/emscripten-core/emscripten/blob/4.0.11/src/lib/libwasi.js?plain=1#L331
170170
// https://github.com/emscripten-core/emscripten/blob/4.0.11/src/lib/libwasi.js?plain=1#L197
171171
try {
172-
var ret = 0;
173-
for (var i = 0; i < iovcnt; i++) {
174-
var ptr = HEAP32[(iovs + IOVEC_T_BUF_OFFSET)/4];
175-
var len = HEAP32[(iovs + IOVEC_T_BUF_LEN_OFFSET)/4];
172+
let ret = 0;
173+
for (let i = 0; i < iovcnt; i++) {
174+
const ptr = HEAP32[(iovs + IOVEC_T_BUF_OFFSET)/4];
175+
const len = HEAP32[(iovs + IOVEC_T_BUF_LEN_OFFSET)/4];
176176
iovs += IOVEC_T_SIZE;
177-
var curr = await stream.stream_ops.readAsync(stream, HEAP8, ptr, len);
177+
const curr = await stream.stream_ops.readAsync(stream, HEAP8, ptr, len);
178178
if (curr < 0) return -1;
179179
ret += curr;
180180
if (curr < len) break; // nothing more to read

Python/sysmodule.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3655,16 +3655,16 @@ static PyStructSequence_Desc emscripten_info_desc = {
36553655
};
36563656

36573657
EM_JS(char *, _Py_emscripten_runtime, (void), {
3658-
var info;
3658+
let info;
36593659
if (typeof navigator == 'object') {
36603660
info = navigator.userAgent;
36613661
} else if (typeof process == 'object') {
36623662
info = "Node.js ".concat(process.version);
36633663
} else {
36643664
info = "UNKNOWN";
36653665
}
3666-
var len = lengthBytesUTF8(info) + 1;
3667-
var res = _malloc(len);
3666+
const len = lengthBytesUTF8(info) + 1;
3667+
const res = _malloc(len);
36683668
if (res) stringToUTF8(info, res, len);
36693669
#if __wasm64__
36703670
return BigInt(res);

0 commit comments

Comments
 (0)