about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-06-11 17:49:22 +0000
committerbors <bors@rust-lang.org>2022-06-11 17:49:22 +0000
commitc08b235a5ce10167632bb0fddcd0c5d67f2d42e3 (patch)
tree3fda5c65937c2aa5d1ced2e18e559a2589744ef4 /src
parent85a26a9a96d3d0b1846cee97abbe6714dcbc6483 (diff)
parent178cffe5634fa9c1207c2c7043830bec722a9d36 (diff)
downloadrust-c08b235a5ce10167632bb0fddcd0c5d67f2d42e3.tar.gz
rust-c08b235a5ce10167632bb0fddcd0c5d67f2d42e3.zip
Auto merge of #97996 - matthiaskrgr:rollup-bvbjlid, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #97904 (Small grammar fix in the compile_error documentation)
 - #97943 (line 1352, change `self` to `*self`, other to `*other`)
 - #97969 (Make -Cpasses= only apply to pre-link optimization)
 - #97990 (Add more eslint checks)
 - #97994 (feat(fix): update some links in `hir.rs`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src')
-rw-r--r--src/librustdoc/html/static/.eslintrc.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js
index 9088e06e508..fc8b5678080 100644
--- a/src/librustdoc/html/static/.eslintrc.js
+++ b/src/librustdoc/html/static/.eslintrc.js
@@ -84,5 +84,10 @@ module.exports = {
         "no-implicit-globals": "error",
         "no-implied-eval": "error",
         "no-label-var": "error",
+        "no-lonely-if": "error",
+        "no-mixed-operators": "error",
+        "no-multi-assign": "error",
+        "no-return-assign": "error",
+        "no-script-url": "error",
     }
 };