Skip to content

Commit 157e51a

Browse files
committed
Minor copyedits
1 parent 5e31876 commit 157e51a

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

src/editions/transitioning-an-existing-project-to-a-new-edition.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ In Rust 2018, it's considered idiomatic to use the [`dyn`
9292
keyword](../rust-2018/trait-system/dyn-trait-for-trait-objects.html) for
9393
trait objects.
9494

95-
We ideally want `cargo fix` to fix all these idioms automatically in the same
96-
manner we did for upgrading to the 2018 edition. **At this point in time,
97-
though, the "idiom lints" are not ready for widespread automatic fixing.** The
95+
Eventually, we want `cargo fix` to fix all these idioms automatically in the same
96+
manner we did for upgrading to the 2018 edition. **Currently,
97+
though, the *"idiom lints"* are not ready for widespread automatic fixing.** The
9898
compiler isn't making `cargo fix`-compatible suggestions in many cases right
99-
now (and is making incorrect suggestions in others), so enabling the idiom
100-
lints, even with `cargo fix`, is likely to leave your crate with many warnings
101-
still remaining.
99+
now, and it is making incorrect suggestions in others. Enabling the idiom lints,
100+
even with `cargo fix`, is likely to leave your crate either broken or with many
101+
warnings still remaining.
102102

103-
It's planned to make these idiom migrations a seamless part of the Rust 2018
103+
We have plans to make these idiom migrations a seamless part of the Rust 2018
104104
experience, but we're not there yet. As a result the following instructions are
105105
recommended only for the intrepid who are willing to work through a few
106106
compiler/Cargo bugs!
@@ -121,24 +121,24 @@ trait Foo {
121121

122122
We're now more idiomatic, and we didn't have to fix our code manually!
123123

124-
As before, `cargo fix` may not be able to automatically update our code.
125-
If `cargo fix` can't fix something, it will print a warning to the console,
126-
and you'll have to fix it manually.
124+
Note that `cargo fix` may still not be able to automatically update our code.
125+
If `cargo fix` can't fix something, it will print a warning to the console, and
126+
you'll have to fix it manually.
127127

128-
Also as mentioned before, there are known bugs around the idiom lints which
129-
means they're not all ready for prime time yet. This means that you may get a
130-
scary-looking warning to report a bug to Cargo, which happens whenever a fix
131-
proposed by rustc actually caused code to stop compiling by accident. If you'd
132-
like `cargo fix` to make as much progress as possible, even if it causes code to
133-
stop compiling, you can execute:
128+
As mentioned before, there are known bugs around the idiom lints which
129+
means they're not all ready for prime time yet. You may get a scary-looking
130+
warning to report a bug to Cargo, which happens whenever a fix proposed by
131+
`rustc` actually caused code to stop compiling by accident. If you'd like `cargo
132+
fix` to make as much progress as possible, even if it causes code to stop
133+
compiling, you can execute:
134134

135135
```console
136136
$ cargo fix --edition-idioms --broken-code
137137
```
138138

139-
This will instruct `cargo fix` to apply changes even if they cause code to stop
140-
compiling, and you'll see the compilation result after all fixes are applied. If
141-
you notice anything awry, please feel free to report an issue to Cargo and we'll
142-
help prioritize and fix it.
139+
This will instruct `cargo fix` to apply automatic suggestions regardless of
140+
whether they work or not. Like usual, you'll see the compilation result after
141+
all fixes are applied. If you notice anything wrong or unusual, please feel free
142+
to report an issue to Cargo and we'll help prioritize and fix it.
143143

144144
Enjoy the new edition!

0 commit comments

Comments
 (0)