Skip to content

Commit 5d194d1

Browse files
committed
Auto merge of #8181 - ApamNapat:typos_fixes, r=giraffate
Fixed some typos in README and CONTRIBUTING changelog: none
2 parents adba132 + b59ff58 commit 5d194d1

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,16 @@ which `IntelliJ Rust` will be able to understand.
118118
Run `cargo dev setup intellij --repo-path <repo-path>` where `<repo-path>` is a path to the rustc repo
119119
you just cloned.
120120
The command will add path-dependencies pointing towards rustc-crates inside the rustc repo to
121-
Clippys `Cargo.toml`s and should allow `IntelliJ Rust` to understand most of the types that Clippy uses.
121+
Clippy's `Cargo.toml`s and should allow `IntelliJ Rust` to understand most of the types that Clippy uses.
122122
Just make sure to remove the dependencies again before finally making a pull request!
123123

124124
[rustc_repo]: https://github.com/rust-lang/rust/
125125
[IntelliJ_rust_homepage]: https://intellij-rust.github.io/
126126

127127
### Rust Analyzer
128128
As of [#6869][6869], [`rust-analyzer`][ra_homepage] can understand that Clippy uses compiler-internals
129-
using `extern crate` when `package.metadata.rust-analyzer.rustc_private` is set to `true` in Clippys `Cargo.toml.`
130-
You will required a `nightly` toolchain with the `rustc-dev` component installed.
129+
using `extern crate` when `package.metadata.rust-analyzer.rustc_private` is set to `true` in Clippy's `Cargo.toml.`
130+
You will require a `nightly` toolchain with the `rustc-dev` component installed.
131131
Make sure that in the `rust-analyzer` configuration, you set
132132
```
133133
{ "rust-analyzer.rustcSource": "discover" }
@@ -228,7 +228,7 @@ about `subtree`s in the Rust repository see [Rust's `CONTRIBUTING.md`][subtree].
228228

229229
### Patching git-subtree to work with big repos
230230

231-
Currently there's a bug in `git-subtree` that prevents it from working properly
231+
Currently, there's a bug in `git-subtree` that prevents it from working properly
232232
with the [`rust-lang/rust`] repo. There's an open PR to fix that, but it's stale.
233233
Before continuing with the following steps, we need to manually apply that fix to
234234
our local copy of `git-subtree`.

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ line. (You can swap `clippy::all` with the specific lint category you are target
144144
## Configuration
145145

146146
Some lints can be configured in a TOML file named `clippy.toml` or `.clippy.toml`. It contains a basic `variable =
147-
value` mapping eg.
147+
value` mapping e.g.
148148

149149
```toml
150150
avoid-breaking-exported-api = false
@@ -197,7 +197,7 @@ And to warn on `lint_name`, run
197197
cargo clippy -- -W clippy::lint_name
198198
```
199199

200-
This also works with lint groups. For example you
200+
This also works with lint groups. For example, you
201201
can run Clippy with warnings for all lints enabled:
202202
```terminal
203203
cargo clippy -- -W clippy::pedantic
@@ -232,7 +232,7 @@ fn main() {
232232
You can also omit the patch version when specifying the MSRV, so `msrv = 1.30`
233233
is equivalent to `msrv = 1.30.0`.
234234

235-
Note: `custom_inner_attributes` is an unstable feature so it has to be enabled explicitly.
235+
Note: `custom_inner_attributes` is an unstable feature, so it has to be enabled explicitly.
236236

237237
Lints that recognize this configuration option can be found [here](https://rust-lang.github.io/rust-clippy/master/index.html#msrv)
238238

0 commit comments

Comments
 (0)