Skip to content

Commit f6cc6f6

Browse files
authored
Merge pull request #2795 from rust-lang/tshepang/sembr
sembr a few files
2 parents 38e8f01 + f55bd01 commit f6cc6f6

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

src/backend/updating-llvm.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ Rust supports building against multiple LLVM versions:
77
PRs for such fixes are tagged with `llvm-main`.
88
* The latest released major version is always supported.
99
* The one or two preceding major versions are usually supported in the sense that they are expected
10-
to build successfully and pass most tests. However, fixes for miscompilations often do not get
10+
to build successfully and pass most tests.
11+
However, fixes for miscompilations often do not get
1112
backported to past LLVM versions, so using rustc with older versions of LLVM comes with an
12-
increased risk of soundness bugs. We strongly recommend using the latest version of LLVM.
13+
increased risk of soundness bugs.
14+
We strongly recommend using the latest version of LLVM.
1315

1416
By default, Rust uses its own fork in the [rust-lang/llvm-project repository].
1517
This fork is based on a `release/$N.x` branch of the upstream project, where

src/diagnostics/translation.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ There are two ways of writing translatable diagnostics:
3131
("Simple" diagnostics being those that don't require a lot of logic in
3232
deciding to emit subdiagnostics and can therefore be represented as diagnostic structs).
3333
See [the diagnostic and subdiagnostic structs documentation](./diagnostic-structs.md).
34-
2. Using typed identifiers with `Diag` APIs (in
35-
`Diagnostic` or `Subdiagnostic` implementations).
34+
2. Using typed identifiers with `Diag` APIs (in `Diagnostic` or `Subdiagnostic` implementations).
3635

3736
When adding or changing a translatable diagnostic,
3837
you don't need to worry about the translations.

src/git.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,9 @@ Both the upside and downside of this is that it simplifies the history.
383383
On the one hand, you lose track of the steps in which changes were made, but
384384
the history becomes easier to work with.
385385

386-
The easiest way to squash your commits in a PR on the `rust-lang/rust` repository is to use the `@bors squash` command in a comment on the PR. By default, [bors] combines all commit messages of the PR into the squashed commit message. To customize the commit message, use `@bors squash msg=<commit message>`.
386+
The easiest way to squash your commits in a PR on the `rust-lang/rust` repository is to use the `@bors squash` command in a comment on the PR.
387+
By default, [bors] combines all commit messages of the PR into the squashed commit message.
388+
To customize the commit message, use `@bors squash msg=<commit message>`.
387389

388390

389391
If you want to squash commits using local git operations, read on below.

src/tracing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ of `tracing-subscriber`](https://docs.rs/tracing-subscriber/0.2.24/tracing_subsc
1414

1515
## Environment variables
1616

17-
This is an overview of the environment variables rustc accepts to customize
18-
its tracing output. The definition of these can mostly be found in `compiler/rustc_log/src/lib.rs`.
17+
This is an overview of the environment variables rustc accepts to customize its tracing output.
18+
The definition of these can mostly be found in `compiler/rustc_log/src/lib.rs`.
1919

2020
| Name | Usage |
2121
| ------------------------- | ----------------------------------------------------------------------------------------------------------------------- |

0 commit comments

Comments
 (0)