From 231b47b2b93c538f32cce0103e883916431ff845 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 25 May 2022 13:53:19 +0200 Subject: [PATCH 1/7] Add eslint rule "space-infix-ops" --- src/librustdoc/html/static/.eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js index bf962303b3a..85a34767b77 100644 --- a/src/librustdoc/html/static/.eslintrc.js +++ b/src/librustdoc/html/static/.eslintrc.js @@ -47,5 +47,6 @@ module.exports = { { "beforeColon": false, "afterColon": true, "mode": "strict" } ], "func-call-spacing": ["error", "never"], + "space-infix-ops": "error", } }; From 6c7156d48814236eee8590d343d5b566d3ec8fc8 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 25 May 2022 13:55:09 +0200 Subject: [PATCH 2/7] Add new eslint rule "space-before-function-paren" --- src/librustdoc/html/static/.eslintrc.js | 1 + src/librustdoc/html/static/js/main.js | 4 ++-- src/librustdoc/html/static/js/scrape-examples.js | 2 +- src/librustdoc/html/static/js/settings.js | 2 +- src/librustdoc/html/static/js/source-script.js | 2 +- src/librustdoc/html/static/js/storage.js | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js index 85a34767b77..ff9e217b290 100644 --- a/src/librustdoc/html/static/.eslintrc.js +++ b/src/librustdoc/html/static/.eslintrc.js @@ -48,5 +48,6 @@ module.exports = { ], "func-call-spacing": ["error", "never"], "space-infix-ops": "error", + "space-before-function-paren": ["error", "never"], } }; diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js index 454c7f557b9..0fbc2d0e33c 100644 --- a/src/librustdoc/html/static/js/main.js +++ b/src/librustdoc/html/static/js/main.js @@ -63,7 +63,7 @@ function showMain() { removeClass(document.getElementById(MAIN_ID), "hidden"); } -(function () { +(function() { window.rootPath = getVar("root-path"); window.currentCrate = getVar("current-crate"); window.searchJS = resourcePath("search", ".js"); @@ -929,7 +929,7 @@ function loadCss(cssFileName) { searchState.setup(); }()); -(function () { +(function() { let reset_button_timeout = null; window.copy_path = but => { diff --git a/src/librustdoc/html/static/js/scrape-examples.js b/src/librustdoc/html/static/js/scrape-examples.js index 7b9d86a851b..fd7a1449763 100644 --- a/src/librustdoc/html/static/js/scrape-examples.js +++ b/src/librustdoc/html/static/js/scrape-examples.js @@ -2,7 +2,7 @@ "use strict"; -(function () { +(function() { // Number of lines shown when code viewer is not expanded const MAX_LINES = 10; diff --git a/src/librustdoc/html/static/js/settings.js b/src/librustdoc/html/static/js/settings.js index 8770cc3f3b1..232c55f293a 100644 --- a/src/librustdoc/html/static/js/settings.js +++ b/src/librustdoc/html/static/js/settings.js @@ -5,7 +5,7 @@ "use strict"; -(function () { +(function() { const isSettingsPage = window.location.pathname.endsWith("/settings.html"); function changeSetting(settingName, value) { diff --git a/src/librustdoc/html/static/js/source-script.js b/src/librustdoc/html/static/js/source-script.js index 15e3bdf47b2..aaac878d3a3 100644 --- a/src/librustdoc/html/static/js/source-script.js +++ b/src/librustdoc/html/static/js/source-script.js @@ -187,7 +187,7 @@ function highlightSourceLines(match) { } } -const handleSourceHighlight = (function () { +const handleSourceHighlight = (function() { let prev_line_id = 0; const set_fragment = name => { diff --git a/src/librustdoc/html/static/js/storage.js b/src/librustdoc/html/static/js/storage.js index 3fcf66a817e..4fcf0499234 100644 --- a/src/librustdoc/html/static/js/storage.js +++ b/src/librustdoc/html/static/js/storage.js @@ -4,7 +4,7 @@ const darkThemes = ["dark", "ayu"]; window.currentTheme = document.getElementById("themeStyle"); window.mainTheme = document.getElementById("mainThemeStyle"); -const settingsDataset = (function () { +const settingsDataset = (function() { const settingsElement = document.getElementById("default-settings"); if (settingsElement === null) { return null; @@ -163,7 +163,7 @@ function useSystemTheme(value) { } } -const updateSystemTheme = (function () { +const updateSystemTheme = (function() { if (!window.matchMedia) { // fallback to the CSS computed value return () => { From c5e39548877b57c0a5d7bd24c620b1de5eaf648e Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 25 May 2022 13:55:54 +0200 Subject: [PATCH 3/7] Add new eslint rule "space-before-blocks" --- src/librustdoc/html/static/.eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js index ff9e217b290..c67a358fbe1 100644 --- a/src/librustdoc/html/static/.eslintrc.js +++ b/src/librustdoc/html/static/.eslintrc.js @@ -49,5 +49,6 @@ module.exports = { "func-call-spacing": ["error", "never"], "space-infix-ops": "error", "space-before-function-paren": ["error", "never"], + "space-before-blocks": "error", } }; From 4dbc6764cfda9b760a854eac6e4a4600add31c46 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 25 May 2022 13:56:27 +0200 Subject: [PATCH 4/7] Add new eslint rule "comma-dangle" --- src/librustdoc/html/static/.eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js index c67a358fbe1..509f2841c5d 100644 --- a/src/librustdoc/html/static/.eslintrc.js +++ b/src/librustdoc/html/static/.eslintrc.js @@ -50,5 +50,6 @@ module.exports = { "space-infix-ops": "error", "space-before-function-paren": ["error", "never"], "space-before-blocks": "error", + "comma-dangle": ["error", "always-multiline"], } }; From 33245e0bb38a35ca1cdcebbfc9e2b75a271fce28 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 25 May 2022 13:57:08 +0200 Subject: [PATCH 5/7] Add new eslint rule "comma-style" --- src/librustdoc/html/static/.eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js index 509f2841c5d..64647177cbd 100644 --- a/src/librustdoc/html/static/.eslintrc.js +++ b/src/librustdoc/html/static/.eslintrc.js @@ -51,5 +51,6 @@ module.exports = { "space-before-function-paren": ["error", "never"], "space-before-blocks": "error", "comma-dangle": ["error", "always-multiline"], + "comma-style": ["error", "last"], } }; From 36d3c7e3c6b38bc65b405a36cdee6dc0f5fcf4e0 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 25 May 2022 13:58:14 +0200 Subject: [PATCH 6/7] Add new eslint rule "max-len" --- src/librustdoc/html/static/.eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js index 64647177cbd..6052444d97a 100644 --- a/src/librustdoc/html/static/.eslintrc.js +++ b/src/librustdoc/html/static/.eslintrc.js @@ -52,5 +52,6 @@ module.exports = { "space-before-blocks": "error", "comma-dangle": ["error", "always-multiline"], "comma-style": ["error", "last"], + "max-len": ["error", { "code": 100, "tabWidth": 4 }], } }; From bb29d5d6e0abbd028bfdecf36c399c1b1f44d1e5 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 25 May 2022 13:58:42 +0200 Subject: [PATCH 7/7] Add new eslint rule "eol-last" --- src/librustdoc/html/static/.eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js index 6052444d97a..7afd09b34d3 100644 --- a/src/librustdoc/html/static/.eslintrc.js +++ b/src/librustdoc/html/static/.eslintrc.js @@ -53,5 +53,6 @@ module.exports = { "comma-dangle": ["error", "always-multiline"], "comma-style": ["error", "last"], "max-len": ["error", { "code": 100, "tabWidth": 4 }], + "eol-last": ["error", "always"], } };