Skip to content

Commit

Permalink
Auto merge of #9533 - akien-mga:patch-to-replace-replace-with-patch, …
Browse files Browse the repository at this point in the history
…r=alexcrichton

Replace deprecated `[replace]` references with `[patch]`

Cf. #7092.

Note: Untested, but given the changes I figure that if the testsuite passes it should be fairly safe.
  • Loading branch information
bors committed Jun 2, 2021
2 parents 0cecbd6 + 0a40a0a commit 6b6ddaa
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ never intended to support this feature, so for now this message is just a
warning. In the future, however, this message will become a hard error.
To change the dependency graph via an override it's recommended to use the
`[replace]` feature of Cargo instead of the path override feature. This is
`[patch]` feature of Cargo instead of the path override feature. This is
documented online at the url below for more information.
https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/sources/directory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ impl<'cfg> Source for DirectorySource<'cfg> {
\n\
directory sources are not intended to be edited, if \
modifications are required then it is recommended \
that [replace] is used with a forked copy of the \
that `[patch]` is used with a forked copy of the \
source\
",
file.display(),
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/directory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ expected: [..]
actual: [..]
directory sources are not intended to be edited, if modifications are \
required then it is recommended that [replace] is used with a forked copy of \
required then it is recommended that `[patch]` is used with a forked copy of \
the source
",
)
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/paths.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ never intended to support this feature, so for now this message is just a
warning. In the future, however, this message will become a hard error.
To change the dependency graph via an override it's recommended to use the
`[replace]` feature of Cargo instead of the path override feature. This is
`[patch]` feature of Cargo instead of the path override feature. This is
documented online at the url below for more information.
https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html
Expand Down

0 comments on commit 6b6ddaa

Please sign in to comment.