diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:03 +0000 |
| commit | 9918693037dce8aa4bb6f08741b6812923486c18 (patch) | |
| tree | 21d2b40bec7e6a7ea664acee056eb3d08e15a1cf /src/doc/edition-guide | |
| parent | Releasing progress-linux version 1.75.0+dfsg1-5~progress7.99u1. (diff) | |
| download | rustc-9918693037dce8aa4bb6f08741b6812923486c18.tar.xz rustc-9918693037dce8aa4bb6f08741b6812923486c18.zip | |
Merging upstream version 1.76.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/doc/edition-guide')
4 files changed, 6 insertions, 6 deletions
diff --git a/src/doc/edition-guide/src/editions/advanced-migrations.md b/src/doc/edition-guide/src/editions/advanced-migrations.md index b804ae644..a1a5d8071 100644 --- a/src/doc/edition-guide/src/editions/advanced-migrations.md +++ b/src/doc/edition-guide/src/editions/advanced-migrations.md @@ -190,7 +190,7 @@ We're now more idiomatic, and we didn't have to fix our code manually! [`cargo fix`]: ../../cargo/commands/cargo-fix.html [`explicit-outlives-requirements`]: ../../rustc/lints/listing/allowed-by-default.html#explicit-outlives-requirements [`keyword-idents`]: ../../rustc/lints/listing/allowed-by-default.html#keyword-idents -[`rustfix`]: https://github.com/rust-lang/rustfix +[`rustfix`]: https://crates.io/crates/rustfix [`unused-extern-crates`]: ../../rustc/lints/listing/allowed-by-default.html#unused-extern-crates [Cargo features]: ../../cargo/reference/features.html [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! [proc macros]: ../../reference/procedural-macros.html [Rust Analyzer extension]: https://marketplace.visualstudio.com/items?itemName=matklad.rust-analyzer [rustdoc-annotation]: ../../rustdoc/documentation-tests.html#attributes -[rustfix-examples]: https://github.com/rust-lang/rustfix/tree/master/examples +[rustfix-examples]: https://github.com/rust-lang/cargo/tree/master/crates/rustfix/examples [Visual Studio Code]: https://code.visualstudio.com/ diff --git a/src/doc/edition-guide/src/rust-2021/disjoint-capture-in-closures.md b/src/doc/edition-guide/src/rust-2021/disjoint-capture-in-closures.md index 25da6d71c..b4a405880 100644 --- a/src/doc/edition-guide/src/rust-2021/disjoint-capture-in-closures.md +++ b/src/doc/edition-guide/src/rust-2021/disjoint-capture-in-closures.md @@ -32,7 +32,7 @@ Disjoint capture was proposed as part of [RFC 2229](https://github.com/rust-lang 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. -In order to have `rustfix` migrate your code to be Rust 2021 Edition compatible, run: +In order to migrate your code to be Rust 2021 Edition compatible, run: ```sh cargo fix --edition diff --git a/src/doc/edition-guide/src/rust-2021/prelude.md b/src/doc/edition-guide/src/rust-2021/prelude.md index be1fbf111..7b05ecc09 100644 --- a/src/doc/edition-guide/src/rust-2021/prelude.md +++ b/src/doc/edition-guide/src/rust-2021/prelude.md @@ -36,7 +36,7 @@ The tracking issue [can be found here](https://github.com/rust-lang/rust/issues/ 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. -In order to have `rustfix` migrate your code to be Rust 2021 Edition compatible, run: +In order to migrate your code to be Rust 2021 Edition compatible, run: ```sh cargo fix --edition @@ -44,7 +44,7 @@ cargo fix --edition 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. -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. +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. ### Migration needed diff --git a/src/doc/edition-guide/src/rust-2021/reserving-syntax.md b/src/doc/edition-guide/src/rust-2021/reserving-syntax.md index a4a7114a6..d49a46ab3 100644 --- a/src/doc/edition-guide/src/rust-2021/reserving-syntax.md +++ b/src/doc/edition-guide/src/rust-2021/reserving-syntax.md @@ -56,7 +56,7 @@ committed to any of them yet): 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. -In order to have `rustfix` migrate your code to be Rust 2021 Edition compatible, run: +In order to migrate your code to be Rust 2021 Edition compatible, run: ```sh cargo fix --edition |