diff options
| author | bors <bors@rust-lang.org> | 2022-06-06 23:53:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-06 23:53:07 +0000 |
| commit | 54aa8a7858cf539336c5639e35c4013dc25abd7b (patch) | |
| tree | f4408afc226cef8f0bee4040941ee14474177677 | |
| parent | 50b00252aeb77b10db04d65dc9e12ce758def4b5 (diff) | |
| parent | fece76d7bc0674626aab7f73df76370f2af467f5 (diff) | |
| download | rust-54aa8a7858cf539336c5639e35c4013dc25abd7b.tar.gz rust-54aa8a7858cf539336c5639e35c4013dc25abd7b.zip | |
Auto merge of #97809 - matthiaskrgr:rollup-ajyvjd3, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #97700 (Add note to documentation of HashSet::intersection) - #97792 (More eslint checks) - #97794 (Fix typo in redundant_pattern_match.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
| -rw-r--r-- | library/std/src/collections/hash/set.rs | 6 | ||||
| -rw-r--r-- | src/librustdoc/html/static/.eslintrc.js | 6 | ||||
| -rw-r--r-- | src/librustdoc/html/static/js/main.js | 2 | ||||
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/matches/redundant_pattern_match.rs | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/library/std/src/collections/hash/set.rs b/library/std/src/collections/hash/set.rs index 19428fe9a23..fa498a987d6 100644 --- a/library/std/src/collections/hash/set.rs +++ b/library/std/src/collections/hash/set.rs @@ -588,6 +588,12 @@ where /// Visits the values representing the intersection, /// i.e., the values that are both in `self` and `other`. /// + /// When an equal element is present in `self` and `other` + /// then the resulting `Intersection` may yield references to + /// one or the other. This can be relevant if `T` contains fields which + /// are not compared by its `Eq` implementation, and may hold different + /// value between the two equal copies of `T` in the two sets. + /// /// # Examples /// /// ``` diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js index bd83b254caa..9088e06e508 100644 --- a/src/librustdoc/html/static/.eslintrc.js +++ b/src/librustdoc/html/static/.eslintrc.js @@ -78,5 +78,11 @@ module.exports = { "block-scoped-var": "error", "guard-for-in": "error", "no-alert": "error", + "no-confusing-arrow": "error", + "no-div-regex": "error", + "no-floating-decimal": "error", + "no-implicit-globals": "error", + "no-implied-eval": "error", + "no-label-var": "error", } }; diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js index 548aeedd033..414bca850e3 100644 --- a/src/librustdoc/html/static/js/main.js +++ b/src/librustdoc/html/static/js/main.js @@ -882,7 +882,7 @@ function loadCss(cssFileName) { ["-", "Collapse all sections"], ].map(x => "<dt>" + x[0].split(" ") - .map((y, index) => (index & 1) === 0 ? "<kbd>" + y + "</kbd>" : " " + y + " ") + .map((y, index) => ((index & 1) === 0 ? "<kbd>" + y + "</kbd>" : " " + y + " ")) .join("") + "</dt><dd>" + x[1] + "</dd>").join(""); const div_shortcuts = document.createElement("div"); addClass(div_shortcuts, "shortcuts"); diff --git a/src/tools/clippy/clippy_lints/src/matches/redundant_pattern_match.rs b/src/tools/clippy/clippy_lints/src/matches/redundant_pattern_match.rs index 095cd43ea13..0ea3f3b673b 100644 --- a/src/tools/clippy/clippy_lints/src/matches/redundant_pattern_match.rs +++ b/src/tools/clippy/clippy_lints/src/matches/redundant_pattern_match.rs @@ -70,7 +70,7 @@ fn temporaries_need_ordered_drop<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr< } } }, - // the base type is alway taken by reference. + // the base type is always taken by reference. // e.g. In `(vec![0])[0]` the vector is a temporary value. ExprKind::Index(base, index) => { if !matches!(base.kind, ExprKind::Path(_)) { |
