Fix all non-bug lints

This change fixes all non-bug lints. A few lint rules are tweaked, and a few code lines are tweaked (almost all dead code elimination).

Also, update the rustdoc-js tester in anticipation of let/const statements.

Author: JohnHeitmann

src/librustdoc/html/static/.eslintrc.js

@@ -6,7 +6,7 @@ module.exports = {
     "extends": "eslint:recommended",
     "parserOptions": {
         "ecmaVersion": 2015,
-        "sourceType": "module"
+        "sourceType": "script"
     },
     "rules": {
         "linebreak-style": [
@@ -16,6 +16,10 @@ module.exports = {
         "semi": [
             "error",
             "always"
+        ],
+        "no-constant-condition": [
+            "error",
+            { "checkLoops": false }
         ]
     }
 };

src/librustdoc/html/static/main.js

@@ -1,9 +1,12 @@
 // From rust:
 /* global ALIASES, currentCrate, rootPath */
 
+// From DOM global ids:
+/* global help */
+
 // Local js definitions:
 /* global addClass, getCurrentValue, hasClass */
-/* global isHidden onEach, removeClass, updateLocalStorage */
+/* global isHidden, onEachLazy, removeClass, updateLocalStorage */
 
 if (!String.prototype.startsWith) {
     String.prototype.startsWith = function(searchString, position) {
@@ -79,8 +82,6 @@ if (!DOMTokenList.prototype.remove) {
     // 2 for "In Return Types"
     var currentTab = 0;
 
-    var themesWidth = null;
-
     var titleBeforeSearch = document.title;
 
     function getPageId() {
@@ -378,7 +379,7 @@ if (!DOMTokenList.prototype.remove) {
                 len = rootPath.match(/\.\.\//g).length + 1;
 
             for (i = 0; i < len; ++i) {
-                match = url.match(/\/[^\/]*$/);
+                match = url.match(/\/[^/]*$/);
                 if (i < len - 1) {
                     stripped = match[0] + stripped;
                 }
@@ -631,8 +632,6 @@ if (!DOMTokenList.prototype.remove) {
                     if (obj.length > GENERICS_DATA &&
                           obj[GENERICS_DATA].length >= val.generics.length) {
                         var elems = obj[GENERICS_DATA].slice(0);
-                        var total = 0;
-                        var done = 0;
                         // We need to find the type that matches the most to remove it in order
                         // to move forward.
                         var vlength = val.generics.length;
@@ -649,8 +648,6 @@ if (!DOMTokenList.prototype.remove) {
                             if (lev.pos !== -1) {
                                 elems.splice(lev.pos, 1);
                                 lev_distance = Math.min(lev.lev, lev_distance);
-                                total += lev.lev;
-                                done += 1;
                             } else {
                                 return MAX_LEV_DISTANCE + 1;
                             }
@@ -912,7 +909,6 @@ if (!DOMTokenList.prototype.remove) {
                     fullId = generateId(ty);
 
                     // allow searching for void (no output) functions as well
-                    var typeOutput = type.length > OUTPUT_DATA ? type[OUTPUT_DATA].name : "";
                     returned = checkReturned(ty, output, true);
                     if (output.name === "*" || returned === true) {
                         in_args = false;
@@ -959,7 +955,7 @@ if (!DOMTokenList.prototype.remove) {
                 query.output = val;
                 query.search = val;
                 // gather matching search results up to a certain maximum
-                val = val.replace(/\_/g, "");
+                val = val.replace(/_/g, "");
 
                 var valGenerics = extractGenerics(val);
 
@@ -976,12 +972,10 @@ if (!DOMTokenList.prototype.remove) {
 
                 for (j = 0; j < nSearchWords; ++j) {
                     var lev;
-                    var lev_distance;
                     ty = searchIndex[j];
                     if (!ty || (filterCrates !== undefined && ty.crate !== filterCrates)) {
                         continue;
                     }
-                    var lev_distance;
                     var lev_add = 0;
                     if (paths.length > 1) {
                         lev = checkPath(contains, paths[paths.length - 1], ty);

src/librustdoc/html/static/settings.js

@@ -1,3 +1,6 @@
+// Local js definitions:
+/* global getCurrentValue, updateLocalStorage */
+
 (function () {
     function changeSetting(settingName, isEnabled) {
         updateLocalStorage('rustdoc-' + settingName, isEnabled);

src/librustdoc/html/static/source-script.js

@@ -1,6 +1,9 @@
 // From rust:
 /* global sourcesIndex */
 
+// From DOM global ids:
+/* global search */
+
 // Local js definitions:
 /* global addClass, getCurrentValue, hasClass, removeClass, updateLocalStorage */
 

src/librustdoc/html/static/storage.js

@@ -1,6 +1,9 @@
 // From rust:
 /* global resourcesSuffix */
 
+// eslint doesn't understand the functions here are used elsewhere
+/*eslint no-unused-vars: "off"*/
+
 var currentTheme = document.getElementById("themeStyle");
 var mainTheme = document.getElementById("mainThemeStyle");
 

src/tools/rustdoc-js/tester.js

@@ -81,9 +81,9 @@ function extractFunction(content, functionName) {
 
 // Stupid function extractor for array.
 function extractArrayVariable(content, arrayName) {
-    var splitter = "var " + arrayName;
+    var splitter = new RegExp("(?:var|const|let) " + arrayName);
     while (true) {
-        var start = content.indexOf(splitter);
+        var start = content.search(splitter);
         if (start === -1) {
             break;
         }
@@ -126,9 +126,9 @@ function extractArrayVariable(content, arrayName) {
 
 // Stupid function extractor for variable.
 function extractVariable(content, varName) {
-    var splitter = "var " + varName;
+    var splitter = new RegExp("(?:var|const|let) " + varName);
     while (true) {
-        var start = content.indexOf(splitter);
+        var start = content.search(splitter);
         if (start === -1) {
             break;
         }