Skip to content

Commit bbffb07

Browse files
authored
Merge pull request #287 from ehuss/rustfix
Update links and text about rustfix.
2 parents 5a4e7ba + 0562627 commit bbffb07

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/editions/advanced-migrations.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ We're now more idiomatic, and we didn't have to fix our code manually!
190190
[`cargo fix`]: ../../cargo/commands/cargo-fix.html
191191
[`explicit-outlives-requirements`]: ../../rustc/lints/listing/allowed-by-default.html#explicit-outlives-requirements
192192
[`keyword-idents`]: ../../rustc/lints/listing/allowed-by-default.html#keyword-idents
193-
[`rustfix`]: https://github.com/rust-lang/rustfix
193+
[`rustfix`]: https://crates.io/crates/rustfix
194194
[`unused-extern-crates`]: ../../rustc/lints/listing/allowed-by-default.html#unused-extern-crates
195195
[Cargo features]: ../../cargo/reference/features.html
196196
[Cargo package]: ../../cargo/reference/manifest.html#the-package-section
@@ -206,5 +206,5 @@ We're now more idiomatic, and we didn't have to fix our code manually!
206206
[proc macros]: ../../reference/procedural-macros.html
207207
[Rust Analyzer extension]: https://marketplace.visualstudio.com/items?itemName=matklad.rust-analyzer
208208
[rustdoc-annotation]: ../../rustdoc/documentation-tests.html#attributes
209-
[rustfix-examples]: https://github.com/rust-lang/rustfix/tree/master/examples
209+
[rustfix-examples]: https://github.com/rust-lang/cargo/tree/master/crates/rustfix/examples
210210
[Visual Studio Code]: https://code.visualstudio.com/

src/rust-2021/disjoint-capture-in-closures.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Disjoint capture was proposed as part of [RFC 2229](https://github.com/rust-lang
3232

3333
As a part of the 2021 edition a migration lint, `rust_2021_incompatible_closure_captures`, has been added in order to aid in automatic migration of Rust 2018 codebases to Rust 2021.
3434

35-
In order to have `rustfix` migrate your code to be Rust 2021 Edition compatible, run:
35+
In order to migrate your code to be Rust 2021 Edition compatible, run:
3636

3737
```sh
3838
cargo fix --edition

src/rust-2021/prelude.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ The tracking issue [can be found here](https://github.com/rust-lang/rust/issues/
3636

3737
As a part of the 2021 edition a migration lint, `rust_2021_prelude_collisions`, has been added in order to aid in automatic migration of Rust 2018 codebases to Rust 2021.
3838

39-
In order to have `rustfix` migrate your code to be Rust 2021 Edition compatible, run:
39+
In order to migrate your code to be Rust 2021 Edition compatible, run:
4040

4141
```sh
4242
cargo fix --edition
4343
```
4444

4545
The lint detects cases where functions or methods are called that have the same name as the methods defined in one of the new prelude traits. In some cases, it may rewrite your calls in various ways to ensure that you continue to call the same function you did before.
4646

47-
If you'd like to migrate your code manually or better understand what `rustfix` is doing, below we've outlined the situations where a migration is needed along with a counter example of when it's not needed.
47+
If you'd like to migrate your code manually or better understand what `cargo fix` is doing, below we've outlined the situations where a migration is needed along with a counter example of when it's not needed.
4848

4949
### Migration needed
5050

src/rust-2021/reserving-syntax.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ committed to any of them yet):
5656

5757
As a part of the 2021 edition a migration lint, `rust_2021_prefixes_incompatible_syntax`, has been added in order to aid in automatic migration of Rust 2018 codebases to Rust 2021.
5858

59-
In order to have `rustfix` migrate your code to be Rust 2021 Edition compatible, run:
59+
In order to migrate your code to be Rust 2021 Edition compatible, run:
6060

6161
```sh
6262
cargo fix --edition

0 commit comments

Comments
 (0)