Use string.startsWith and string.includes. NFC (#21132)

sbc100 · web-flow · commit 12ee67374a93 · 2024-01-22T14:13:49.000-08:00
diff --git a/src/library.js b/src/library.js
@@ -3454,7 +3454,7 @@ addToLibrary({
     if (x == '__main_argc_argv') {
       x = 'main';
     }
-    return x.indexOf('dynCall_') == 0 || unmangledSymbols.includes(x) ? x : '_' + x;
+    return x.startsWith('dynCall_') || unmangledSymbols.includes(x) ? x : '_' + x;
   },
 
   $asyncLoad__docs: '/** @param {boolean=} noRunDep */',
diff --git a/src/shell.js b/src/shell.js
@@ -379,10 +379,10 @@ if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   // and scriptDirectory will correctly be replaced with an empty string.
   // If scriptDirectory contains a query (starting with ?) or a fragment (starting with #),
   // they are removed because they could contain a slash.
-  if (scriptDirectory.indexOf('blob:') !== 0) {
-    scriptDirectory = scriptDirectory.substr(0, scriptDirectory.replace(/[?#].*/, "").lastIndexOf('/')+1);
-  } else {
+  if (scriptDirectory.startsWith('blob:')) {
     scriptDirectory = '';
+  } else {
+    scriptDirectory = scriptDirectory.substr(0, scriptDirectory.replace(/[?#].*/, "").lastIndexOf('/')+1);
   }
 
 #if ENVIRONMENT && ASSERTIONS
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.gzsize b/test/other/metadce/test_metadce_cxx_ctors1.gzsize
@@ -1 +1 @@
-9938
+9936
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.jssize b/test/other/metadce/test_metadce_cxx_ctors1.jssize
@@ -1 +1 @@
-24685
+24684
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.jssize b/test/other/metadce/test_metadce_cxx_ctors2.jssize
@@ -1 +1 @@
-24653
+24652
diff --git a/test/other/metadce/test_metadce_cxx_except.jssize b/test/other/metadce/test_metadce_cxx_except.jssize
@@ -1 +1 @@
-28575
+28574
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.gzsize b/test/other/metadce/test_metadce_cxx_except_wasm.gzsize
@@ -1 +1 @@
-9905
+9904
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.jssize b/test/other/metadce/test_metadce_cxx_except_wasm.jssize
@@ -1 +1 @@
-24578
+24577
diff --git a/test/other/metadce/test_metadce_cxx_mangle.gzsize b/test/other/metadce/test_metadce_cxx_mangle.gzsize
@@ -1 +1 @@
-11023
+11021
diff --git a/test/other/metadce/test_metadce_cxx_mangle.jssize b/test/other/metadce/test_metadce_cxx_mangle.jssize
@@ -1 +1 @@
-28575
+28574
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.gzsize b/test/other/metadce/test_metadce_cxx_noexcept.gzsize
@@ -1 +1 @@
-9938
+9936
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.jssize b/test/other/metadce/test_metadce_cxx_noexcept.jssize
@@ -1 +1 @@
-24685
+24684
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.gzsize b/test/other/metadce/test_metadce_cxx_wasmfs.gzsize
@@ -1 +1 @@
-5256
+5253
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.jssize b/test/other/metadce/test_metadce_cxx_wasmfs.jssize
@@ -1 +1 @@
-12141
+12140
diff --git a/test/other/metadce/test_metadce_files_js_fs.gzsize b/test/other/metadce/test_metadce_files_js_fs.gzsize
@@ -1 +1 @@
-7877
+7875
diff --git a/test/other/metadce/test_metadce_files_js_fs.jssize b/test/other/metadce/test_metadce_files_js_fs.jssize
@@ -1 +1 @@
-19707
+19706
diff --git a/test/other/metadce/test_metadce_files_wasmfs.gzsize b/test/other/metadce/test_metadce_files_wasmfs.gzsize
@@ -1 +1 @@
-3172
+3167
diff --git a/test/other/metadce/test_metadce_files_wasmfs.jssize b/test/other/metadce/test_metadce_files_wasmfs.jssize
@@ -1 +1 @@
-6888
+6887
diff --git a/test/other/metadce/test_metadce_hello_O0.gzsize b/test/other/metadce/test_metadce_hello_O0.gzsize
@@ -1 +1 @@
-8420
+8416
diff --git a/test/other/metadce/test_metadce_hello_O0.jssize b/test/other/metadce/test_metadce_hello_O0.jssize
@@ -1 +1 @@
-23089
+23086
diff --git a/test/other/metadce/test_metadce_hello_O1.gzsize b/test/other/metadce/test_metadce_hello_O1.gzsize
@@ -1 +1 @@
-3023
+3020
diff --git a/test/other/metadce/test_metadce_hello_O1.jssize b/test/other/metadce/test_metadce_hello_O1.jssize
@@ -1 +1 @@
-7790
+7787
diff --git a/test/other/metadce/test_metadce_hello_O2.gzsize b/test/other/metadce/test_metadce_hello_O2.gzsize
@@ -1 +1 @@
-2668
+2664
diff --git a/test/other/metadce/test_metadce_hello_O2.jssize b/test/other/metadce/test_metadce_hello_O2.jssize
@@ -1 +1 @@
-5543
+5542
diff --git a/test/other/metadce/test_metadce_hello_O3.gzsize b/test/other/metadce/test_metadce_hello_O3.gzsize
@@ -1 +1 @@
-2583
+2580
diff --git a/test/other/metadce/test_metadce_hello_O3.jssize b/test/other/metadce/test_metadce_hello_O3.jssize
@@ -1 +1 @@
-5389
+5388
diff --git a/test/other/metadce/test_metadce_hello_Os.gzsize b/test/other/metadce/test_metadce_hello_Os.gzsize
@@ -1 +1 @@
-2583
+2580
diff --git a/test/other/metadce/test_metadce_hello_Os.jssize b/test/other/metadce/test_metadce_hello_Os.jssize
@@ -1 +1 @@
-5389
+5388
diff --git a/test/other/metadce/test_metadce_hello_Oz.gzsize b/test/other/metadce/test_metadce_hello_Oz.gzsize
@@ -1 +1 @@
-2565
+2562
diff --git a/test/other/metadce/test_metadce_hello_Oz.jssize b/test/other/metadce/test_metadce_hello_Oz.jssize
@@ -1 +1 @@
-5356
+5355
diff --git a/test/other/metadce/test_metadce_hello_dylink.gzsize b/test/other/metadce/test_metadce_hello_dylink.gzsize
@@ -1 +1 @@
-6490
+6486
diff --git a/test/other/metadce/test_metadce_hello_dylink.jssize b/test/other/metadce/test_metadce_hello_dylink.jssize
@@ -1 +1 @@
-14402
+14401
diff --git a/test/other/metadce/test_metadce_hello_export_nothing.gzsize b/test/other/metadce/test_metadce_hello_export_nothing.gzsize
@@ -1 +1 @@
-1934
+1932
diff --git a/test/other/metadce/test_metadce_hello_export_nothing.jssize b/test/other/metadce/test_metadce_hello_export_nothing.jssize
@@ -1 +1 @@
-4175
+4174
diff --git a/test/other/metadce/test_metadce_hello_wasmfs.gzsize b/test/other/metadce/test_metadce_hello_wasmfs.gzsize
@@ -1 +1 @@
-2583
+2580
diff --git a/test/other/metadce/test_metadce_hello_wasmfs.jssize b/test/other/metadce/test_metadce_hello_wasmfs.jssize
@@ -1 +1 @@
-5389
+5388
diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize b/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize
@@ -1 +1 @@
-2167
+2165
diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize b/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize
@@ -1 +1 @@
-4671
+4670
diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize
@@ -1 +1 @@
-2203
+2200
diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize
@@ -1 +1 @@
-4722
+4721
diff --git a/test/other/metadce/test_metadce_mem_O3.gzsize b/test/other/metadce/test_metadce_mem_O3.gzsize
@@ -1 +1 @@
-2621
+2618
diff --git a/test/other/metadce/test_metadce_mem_O3.jssize b/test/other/metadce/test_metadce_mem_O3.jssize
@@ -1 +1 @@
-5570
+5569
diff --git a/test/other/metadce/test_metadce_mem_O3_grow.gzsize b/test/other/metadce/test_metadce_mem_O3_grow.gzsize
@@ -1 +1 @@
-2786
+2783
diff --git a/test/other/metadce/test_metadce_mem_O3_grow.jssize b/test/other/metadce/test_metadce_mem_O3_grow.jssize
@@ -1 +1 @@
-5893
+5892
diff --git a/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize b/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize
@@ -1 +1 @@
-2479
+2476
diff --git a/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize b/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize
@@ -1 +1 @@
-5286
+5285
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone.gzsize
@@ -1 +1 @@
-2444
+2441
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.jssize b/test/other/metadce/test_metadce_mem_O3_standalone.jssize
@@ -1 +1 @@
-5216
+5215
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize
@@ -1 +1 @@
-2188
+2186
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize
@@ -1 +1 @@
-4722
+4721
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize
@@ -1 +1 @@
-2203
+2200
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize
@@ -1 +1 @@
-4722
+4721
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize
@@ -1 +1 @@
-2203
+2200
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize
@@ -1 +1 @@
-4722
+4721
diff --git a/test/other/metadce/test_metadce_minimal_64.gzsize b/test/other/metadce/test_metadce_minimal_64.gzsize
@@ -1 +1 @@
-1728
+1725
diff --git a/test/other/metadce/test_metadce_minimal_64.jssize b/test/other/metadce/test_metadce_minimal_64.jssize
@@ -1 +1 @@
-3648
+3647
diff --git a/test/other/metadce/test_metadce_minimal_O0.gzsize b/test/other/metadce/test_metadce_minimal_O0.gzsize
@@ -1 +1 @@
-7250
+7245
diff --git a/test/other/metadce/test_metadce_minimal_O0.jssize b/test/other/metadce/test_metadce_minimal_O0.jssize
@@ -1 +1 @@
-19713
+19710
diff --git a/test/other/metadce/test_metadce_minimal_O1.gzsize b/test/other/metadce/test_metadce_minimal_O1.gzsize
@@ -1 +1 @@
-1831
+1830
diff --git a/test/other/metadce/test_metadce_minimal_O1.jssize b/test/other/metadce/test_metadce_minimal_O1.jssize
@@ -1 +1 @@
-4440
+4437
diff --git a/test/other/metadce/test_metadce_minimal_O2.gzsize b/test/other/metadce/test_metadce_minimal_O2.gzsize
@@ -1 +1 @@
-1663
+1661
diff --git a/test/other/metadce/test_metadce_minimal_O2.jssize b/test/other/metadce/test_metadce_minimal_O2.jssize
@@ -1 +1 @@
-3375
+3374
diff --git a/test/other/metadce/test_metadce_minimal_O3.gzsize b/test/other/metadce/test_metadce_minimal_O3.gzsize
@@ -1 +1 @@
-1624
+1619
diff --git a/test/other/metadce/test_metadce_minimal_O3.jssize b/test/other/metadce/test_metadce_minimal_O3.jssize
@@ -1 +1 @@
-3325
+3324
diff --git a/test/other/metadce/test_metadce_minimal_Os.gzsize b/test/other/metadce/test_metadce_minimal_Os.gzsize
@@ -1 +1 @@
-1624
+1619
diff --git a/test/other/metadce/test_metadce_minimal_Os.jssize b/test/other/metadce/test_metadce_minimal_Os.jssize
@@ -1 +1 @@
-3325
+3324
diff --git a/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize b/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize
@@ -1 +1 @@
-1615
+1611
diff --git a/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize b/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize
@@ -1 +1 @@
-3310
+3309
diff --git a/test/other/metadce/test_metadce_minimal_Oz.gzsize b/test/other/metadce/test_metadce_minimal_Oz.gzsize
@@ -1 +1 @@
-1624
+1619
diff --git a/test/other/metadce/test_metadce_minimal_Oz.jssize b/test/other/metadce/test_metadce_minimal_Oz.jssize
@@ -1 +1 @@
-3325
+3324
diff --git a/test/other/metadce/test_metadce_minimal_pthreads.gzsize b/test/other/metadce/test_metadce_minimal_pthreads.gzsize
@@ -1 +1 @@
-4928
+4924
diff --git a/test/other/metadce/test_metadce_minimal_pthreads.jssize b/test/other/metadce/test_metadce_minimal_pthreads.jssize
@@ -1 +1 @@
-13667
+13666
diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.gzsize b/test/other/metadce/test_metadce_minimal_wasmfs.gzsize
@@ -1 +1 @@
-1624
+1619
diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.jssize b/test/other/metadce/test_metadce_minimal_wasmfs.jssize
@@ -1 +1 @@
-3325
+3324
diff --git a/test/other/test_unoptimized_code_size.js.size b/test/other/test_unoptimized_code_size.js.size
@@ -1 +1 @@
-58265
+58262
diff --git a/test/other/test_unoptimized_code_size_no_asserts.js.size b/test/other/test_unoptimized_code_size_no_asserts.js.size
@@ -1 +1 @@
-31649
+31646
diff --git a/test/other/test_unoptimized_code_size_strict.js.size b/test/other/test_unoptimized_code_size_strict.js.size
@@ -1 +1 @@
-57107
+57104
diff --git a/test/test_browser.py b/test/test_browser.py
@@ -717,7 +717,7 @@ def setup(assetLocalization):
             window.onerror = (error) => {
               window.disableErrorReporting = true;
               window.onerror = null;
-              var result = error.indexOf("test.data") >= 0 ? 1 : 0;
+              var result = error.includes("test.data") ? 1 : 0;
               var xhr = new XMLHttpRequest();
               xhr.open('GET', 'http://localhost:8888/report_result?' + result, true);
               xhr.send();
@@ -2469,7 +2469,7 @@ def test(what, status):
         xhr.send(null);
 
         console.warn = (x) => {
-          if (x.indexOf('a problem seems to have happened with Module.memoryInitializerRequest') >= 0) {
+          if (x.includes('a problem seems to have happened with Module.memoryInitializerRequest')) {
             maybeReportResultToServer('got_error');
           }
           console.log('WARNING: ' + x);
@@ -2511,7 +2511,7 @@ def test_runtime_misuse(self, mode):
         ok = true; // should fail and not reach here, runtime is not ready yet so ccall will abort
       } catch(e) {
         out('expected fail 1: ' + e.toString());
-        assert(e.toString().indexOf('Assertion failed') >= 0); // assertion, not something else
+        assert(e.toString().includes('Assertion failed')); // assertion, not something else
         ABORT = false; // hackish
       }
       assert(ok === expected_ok);
@@ -2522,7 +2522,7 @@ def test_runtime_misuse(self, mode):
         ok = true; // should fail and not reach here, runtime is not ready yet so cwrap call will abort
       } catch(e) {
         out('expected fail 2: ' + e.toString());
-        assert(e.toString().indexOf('Assertion failed') >= 0); // assertion, not something else
+        assert(e.toString().includes('Assertion failed')); // assertion, not something else
         ABORT = false; // hackish
       }
       assert(ok === expected_ok);
@@ -2533,7 +2533,7 @@ def test_runtime_misuse(self, mode):
         ok = true; // should fail and not reach here, runtime is not ready yet so any code execution
       } catch(e) {
         out('expected fail 3:' + e.toString());
-        assert(e.toString().indexOf('Assertion failed') >= 0); // assertion, not something else
+        assert(e.toString().includes('Assertion failed')); // assertion, not something else
         ABORT = false; // hackish
       }
       assert(ok === expected_ok);
@@ -5108,7 +5108,7 @@ def test_single_file_locate_file(self, args):
       <script>
         var Module = {
           locateFile: function (path) {
-            if (path.indexOf('data:') === 0) {
+            if (path.startsWith('data:')) {
               throw new Error('Unexpected data URI.');
             }
 
diff --git a/tools/toolchain_profiler.results_template.html b/tools/toolchain_profiler.results_template.html
@@ -75,7 +75,7 @@
 function refresh() {
   var hideBlocksSmallerThan = parseInt(document.getElementById('hideBlocksSmallerThan').value);
   var url = window.location.href;
-  if (url.indexOf('?') != -1) url = url.split('?')[0]
+  if (url.includes('?') url = url.split('?')[0]
   window.location.href = url + '?hideBlocksSmallerThan=' + hideBlocksSmallerThan;
 }
 
@@ -105,7 +105,7 @@
 
   // cmdline could be '/path/to/node --param /path/to/file/to/run', in which case
   // we want to return 'run' as the interesting command that was executed
-  if (cmdname.indexOf('node') == 0 || cmdname.indexOf('python') == 0) {
+  if (cmdname.startsWith('node') || cmdname.startsWith('python')) {
     var positionalParams = findPositionalParams(cmdLine, []);
     if (positionalParams.length > 0) return cmdLineBasename(positionalParams);
   }
@@ -159,22 +159,18 @@
   return p;
 }
 
-function startsWith(str, substr) {
-  return str.indexOf(substr) == 0;
-}
-
 // A heuristic approach to finding print-worthy elements from a given command line array.
 function findInterestingBits(cmdLine) {
   var basename = cmdLineBasename(cmdLine);
-  if (startsWith(basename, 'em++') || startsWith(basename, 'emcc')) {
+  if (basename.startsWith('em++') || basename.startsWith('emcc')) {
     src = findValueOfParam(cmdLine, '-c');
     if (src) src = '-c ' + pathBasename(src);
     else {
       src = findValueOfParam(cmdLine, '-o');
       if (src) src = '-o ' + pathBasename(src);
     }
     return [basename, src];
-  } else if (startsWith(basename, 'clang') || startsWith(basename, 'clang++')) {
+  } else if (basename.startsWith('clang') || basename.startsWith('clang++')) {
     var posParams = findPositionalParams(cmdLine, ['-target', '-o']);
     for(var i = 0; i < posParams.length; ++i) {
       if (posParams[i].indexOf('.c') != -1 && (posParams[i].indexOf('/') != -1 || posParams[i].indexOf('\\') != -1))
@@ -184,25 +180,25 @@
     if (out) out = '-o ' + pathBasename(out);
     if (cmdLine.length <= 3) return [basename].concat(cmdLine.slice(1));
     return [basename].concat(posParams).concat([out]);
-  } else if (startsWith(basename, 'llvm-ar') || startsWith(basename, 'optimizer') || startsWith(basename, 'asm2wasm') || startsWith(basename, 'wasm-as')) {
+  } else if (basename.startsWith('llvm-ar') || basename.startsWith('optimizer') || basename.startsWith('asm2wasm') || basename.startsWith('wasm-as')) {
     for(var i = 0; i < cmdLine.length; ++i) {
       if (cmdLine[i].indexOf('/') != -1 || cmdLine[i].indexOf('\\') != -1)
         cmdLine[i] = pathBasename(cmdLine[i]);
     }
     return cmdLine;
-  } else if (startsWith(basename, 'opt')) {
+  } else if (basename.startsWith('opt')) {
     var interestingParams = findInterestingParams(cmdLine, ['-O0', '-O1', '-O2', '-O3', '-Os', '-Oz'])
     var out = findValueOfParam(cmdLine, '-o');
     if (out) out = '-o ' + pathBasename(out);
     return [basename].concat(interestingParams).concat([out]);
-  } else if (startsWith(basename, 'llvm-nm')) {
+  } else if (basename.startsWith('llvm-nm')) {
     var posParams = findPositionalParams(cmdLine, []);
     for(var i = 0; i < posParams.length; ++i) {
       if (posParams[i].indexOf('/') != -1 || posParams[i].indexOf('\\') != -1)
         posParams[i] = pathBasename(posParams[i]);
     }
     return [basename].concat(posParams);
-  } else if (startsWith(basename, 'llc')) {
+  } else if (basename.startsWith('llc')) {
     var interestingParams = findInterestingParams(cmdLine, ['-O0', '-O1', '-O2', '-O3', '-Os', '-Oz'])
     var posParams = findPositionalParams(cmdLine, ['-o']);
     for(var i = 0; i < posParams.length; ++i) {
@@ -217,7 +213,7 @@
         ret.concat([out]);
     }
     return ret;
-  } else if (startsWith(basename, 'compiler.mjs')) {
+  } else if (basename.startsWith('compiler.mjs')) {
     var posParams = findPositionalParams(cmdLine, []);
     var interestingParams = [];
     for(var i = 1; i < posParams.length; ++i) {
@@ -226,7 +222,7 @@
       interestingParams.push(posParams[i]);
     }
     return [basename].concat(interestingParams);
-  } else if (startsWith(basename, 'js-optimizer.js')) {
+  } else if (basename.startsWith('js-optimizer.js')) {
     var posParams = findPositionalParams(cmdLine, []);
     var interestingParams = [];
     for(var i = 1; i < posParams.length; ++i) {

Original file line number	Diff line number	Diff line change
`@@ -3454,7 +3454,7 @@ addToLibrary({`
`3454`	`3454`	`if (x == '__main_argc_argv') {`
`3455`	`3455`	`x = 'main';`
`3456`	`3456`	`}`
`3457`		`- return x.indexOf('dynCall_') == 0 \|\| unmangledSymbols.includes(x) ? x : '_' + x;`
	`3457`	`+ return x.startsWith('dynCall_') \|\| unmangledSymbols.includes(x) ? x : '_' + x;`
`3458`	`3458`	`},`
`3459`	`3459`
`3460`	`3460`	`$asyncLoad__docs: '/** @param {boolean=} noRunDep */',`