Skip to content

Commit 58e7411

Browse files
authored
Rollup merge of #86274 - alexander-melentyev:spaces, r=bjorn3
Spaces
2 parents ac41056 + e84c9ae commit 58e7411

File tree

18 files changed

+48
-48
lines changed

18 files changed

+48
-48
lines changed

.github/ISSUE_TEMPLATE/diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ along with any information you feel relevant to replicating the bug.
99
1010
If you cannot produce a minimal reproduction case (something that would work in
1111
isolation), please provide the steps or even link to a repository that causes
12-
the problematic output to occur.
12+
the problematic output to occur.
1313
-->
1414

1515
Given the following code: <!-- Please provide a link to play.rust-lang.org -->

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Read ["Installation"] from [The Book].
2121
The Rust build system uses a Python script called `x.py` to build the compiler,
2222
which manages the bootstrapping process. It lives in the root of the project.
2323

24-
The `x.py` command can be run directly on most systems in the following format:
24+
The `x.py` command can be run directly on most systems in the following format:
2525

2626
```sh
2727
./x.py <subcommand> [flags]

RELEASES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ Language
369369
--------
370370
- [You can now parameterize items such as functions, traits, and `struct`s by constant
371371
values in addition to by types and lifetimes.][79135] Also known as "const generics"
372-
E.g. you can now write the following. Note: Only values of primitive integers,
372+
E.g. you can now write the following. Note: Only values of primitive integers,
373373
`bool`, or `char` types are currently permitted.
374374
```rust
375375
struct GenericArray<T, const LENGTH: usize> {

config.toml.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ changelog-seen = 2
567567
# On Linux target, if crt-static is not enabled, 'no' means dynamic link to
568568
# `libgcc_s.so`, 'in-tree' means static link to the in-tree build of llvm libunwind
569569
# and 'system' means dynamic link to `libunwind.so`. If crt-static is enabled,
570-
# the behavior is depend on the libc. On musl target, 'no' and 'in-tree' both
571-
# means static link to the in-tree build of llvm libunwind, and 'system' means
570+
# the behavior is depend on the libc. On musl target, 'no' and 'in-tree' both
571+
# means static link to the in-tree build of llvm libunwind, and 'system' means
572572
# static link to `libunwind.a` provided by system. Due to the limitation of glibc,
573573
# it must link to `libgcc_eh.a` to get a working output, and this option have no effect.
574574
#llvm-libunwind = 'no'

src/librustdoc/html/static/FiraSans-LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
2-
with Reserved Font Name < Fira >,
2+
with Reserved Font Name < Fira >,
33

44
This Font Software is licensed under the SIL Open Font License, Version 1.1.
55
This license is copied below, and is also available with a FAQ at:
@@ -19,7 +19,7 @@ with others.
1919

2020
The OFL allows the licensed fonts to be used, studied, modified and
2121
redistributed freely as long as they are not sold by themselves. The
22-
fonts, including any derivative works, can be bundled, embedded,
22+
fonts, including any derivative works, can be bundled, embedded,
2323
redistributed and/or sold with any software provided that any reserved
2424
names are not used by derivative works. The fonts and derivatives,
2525
however, cannot be released under any other type of license. The

src/tools/clippy/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
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

src/tools/clippy/README.md

Lines changed: 1 addition & 1 deletion
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`)

src/tools/clippy/clippy_utils/src/ast_utils.rs

Lines changed: 1 addition & 1 deletion
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))

src/tools/clippy/doc/basics.md

Lines changed: 2 additions & 2 deletions
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.

src/tools/clippy/lintcheck/README.md

Lines changed: 1 addition & 1 deletion
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.

0 commit comments

Comments
 (0)