Skip to content

Commit

Permalink
Auto merge of rust-lang#97809 - matthiaskrgr:rollup-ajyvjd3, r=matthi…
Browse files Browse the repository at this point in the history
…askrgr

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
  • Loading branch information
bors committed Jun 6, 2022
2 parents 50b0025 + fece76d commit 54aa8a7
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
6 changes: 6 additions & 0 deletions library/std/src/collections/hash/set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
///
/// ```
Expand Down
6 changes: 6 additions & 0 deletions src/librustdoc/html/static/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
};
2 changes: 1 addition & 1 deletion src/librustdoc/html/static/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(_)) {
Expand Down

0 comments on commit 54aa8a7

Please sign in to comment.