Skip to content

Commit 54aa8a7

Browse files
committed
Auto merge of rust-lang#97809 - matthiaskrgr:rollup-ajyvjd3, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - rust-lang#97700 (Add note to documentation of HashSet::intersection) - rust-lang#97792 (More eslint checks) - rust-lang#97794 (Fix typo in redundant_pattern_match.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 50b0025 + fece76d commit 54aa8a7

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

library/std/src/collections/hash/set.rs

+6
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,12 @@ where
588588
/// Visits the values representing the intersection,
589589
/// i.e., the values that are both in `self` and `other`.
590590
///
591+
/// When an equal element is present in `self` and `other`
592+
/// then the resulting `Intersection` may yield references to
593+
/// one or the other. This can be relevant if `T` contains fields which
594+
/// are not compared by its `Eq` implementation, and may hold different
595+
/// value between the two equal copies of `T` in the two sets.
596+
///
591597
/// # Examples
592598
///
593599
/// ```

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

+6
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,11 @@ module.exports = {
7878
"block-scoped-var": "error",
7979
"guard-for-in": "error",
8080
"no-alert": "error",
81+
"no-confusing-arrow": "error",
82+
"no-div-regex": "error",
83+
"no-floating-decimal": "error",
84+
"no-implicit-globals": "error",
85+
"no-implied-eval": "error",
86+
"no-label-var": "error",
8187
}
8288
};

src/librustdoc/html/static/js/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ function loadCss(cssFileName) {
882882
["-", "Collapse all sections"],
883883
].map(x => "<dt>" +
884884
x[0].split(" ")
885-
.map((y, index) => (index & 1) === 0 ? "<kbd>" + y + "</kbd>" : " " + y + " ")
885+
.map((y, index) => ((index & 1) === 0 ? "<kbd>" + y + "</kbd>" : " " + y + " "))
886886
.join("") + "</dt><dd>" + x[1] + "</dd>").join("");
887887
const div_shortcuts = document.createElement("div");
888888
addClass(div_shortcuts, "shortcuts");

src/tools/clippy/clippy_lints/src/matches/redundant_pattern_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fn temporaries_need_ordered_drop<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<
7070
}
7171
}
7272
},
73-
// the base type is alway taken by reference.
73+
// the base type is always taken by reference.
7474
// e.g. In `(vec![0])[0]` the vector is a temporary value.
7575
ExprKind::Index(base, index) => {
7676
if !matches!(base.kind, ExprKind::Path(_)) {

0 commit comments

Comments
 (0)