Skip to content

Commit 6e517e9

Browse files
authored
Rollup merge of rust-lang#86274 - alexander-melentyev:spaces, r=bjorn3
Spaces
2 parents 354decc + dab42cf commit 6e517e9

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ We have prioritization labels and a sync-blocker label, which are described belo
342342
- [P-low][p-low]: Requires attention (fix/response/evaluation) by a team member but isn't urgent.
343343
- [P-medium][p-medium]: Should be addressed by a team member until the next sync.
344344
- [P-high][p-high]: Should be immediately addressed and will require an out-of-cycle sync or a backport.
345-
- [L-sync-blocker][l-sync-blocker]: An issue that "blocks" a sync.
345+
- [L-sync-blocker][l-sync-blocker]: An issue that "blocks" a sync.
346346
Or rather: before the sync this should be addressed,
347347
e.g. by removing a lint again, so it doesn't hit beta/stable.
348348

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ As with `cargo check`, this includes dependencies that are members of the worksp
9595
If you want to run Clippy **only** on the given crate, use the `--no-deps` option like this:
9696

9797
```terminal
98-
cargo clippy -p example -- --no-deps
98+
cargo clippy -p example -- --no-deps
9999
```
100100

101101
### As a rustc replacement (`clippy-driver`)

clippy_utils/src/ast_utils.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ pub fn eq_expr(l: &Expr, r: &Expr) -> bool {
178178
(Path(lq, lp), Path(rq, rp)) => both(lq, rq, |l, r| eq_qself(l, r)) && eq_path(lp, rp),
179179
(MacCall(l), MacCall(r)) => eq_mac_call(l, r),
180180
(Struct(lse), Struct(rse)) => {
181-
eq_maybe_qself(&lse.qself, &rse.qself)
181+
eq_maybe_qself(&lse.qself, &rse.qself)
182182
&& eq_path(&lse.path, &rse.path)
183183
&& eq_struct_rest(&lse.rest, &rse.rest)
184184
&& unordered_over(&lse.fields, &rse.fields, |l, r| eq_field(l, r))

doc/basics.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ cargo dev ide_setup
9696

9797
## lintcheck
9898
`cargo lintcheck` will build and run clippy on a fixed set of crates and generate a log of the results.
99-
You can `git diff` the updated log against its previous version and
99+
You can `git diff` the updated log against its previous version and
100100
see what impact your lint made on a small set of crates.
101-
If you add a new lint, please audit the resulting warnings and make sure
101+
If you add a new lint, please audit the resulting warnings and make sure
102102
there are no false positives and that the suggestions are valid.
103103

104104
Refer to the tools [README] for more details.

lintcheck/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,5 @@ You can run `./lintcheck/target/debug/lintcheck --fix` which will run Clippy wit
7373
print a warning if Clippys suggestions fail to apply (if the resulting code does not build).
7474
This lets us spot bad suggestions or false positives automatically in some cases.
7575

76-
Please note that the target dir should be cleaned afterwards since clippy will modify
76+
Please note that the target dir should be cleaned afterwards since clippy will modify
7777
the downloaded sources which can lead to unexpected results when running lintcheck again afterwards.

util/gh-pages/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ <h4 class="list-group-item-heading">
363363

364364
$scope.bySearch = function (lint, index, array) {
365365
let searchStr = $scope.search;
366-
// It can be `null` I haven't missed this value
366+
// It can be `null` I haven't missed this value
367367
if (searchStr == null || searchStr.length < 3) {
368368
return true;
369369
}
@@ -375,7 +375,7 @@ <h4 class="list-group-item-heading">
375375
}
376376

377377
// Search the description
378-
// The use of `for`-loops instead of `foreach` enables us to return early
378+
// The use of `for`-loops instead of `foreach` enables us to return early
379379
let terms = searchStr.split(" ");
380380
for (index = 0; index < terms.length; index++) {
381381
if (lint.id.indexOf(terms[index]) !== -1) {
@@ -463,7 +463,7 @@ <h4 class="list-group-item-heading">
463463

464464
let children = themeMenu.children;
465465
for (let index = 0; index < children.length; index++) {
466-
let child = children[index];
466+
let child = children[index];
467467
child.addEventListener("click", function(e) {
468468
setTheme(child.id, true);
469469
});
@@ -476,7 +476,7 @@ <h4 class="list-group-item-heading">
476476
let enableHighlight = false;
477477
let enableNight = false;
478478
let enableAyu = false;
479-
479+
480480
if (theme == "ayu") {
481481
enableAyu = true;
482482
} else if (theme == "coal" || theme == "navy") {

0 commit comments

Comments
 (0)