Skip to content

Commit 9803862

Browse files
committed
Auto merge of rust-lang#10933 - LPardue:cargo-patch-misspell-grammar, r=ehuss
Grammar fixup unused patch message This is a minor grammar fixup to to message printed when patch source URLs mismatch (introduced in rust-lang#10130).
2 parents 5514f1e + 02e606d commit 9803862

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/cargo/ops/resolve.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ fn emit_warnings_of_unused_patches(
796796
writeln!(msg, "Patch `{}` {}", unused, MESSAGE)?;
797797
write!(
798798
msg,
799-
"Perhaps you misspell the source URL being patched.\n\
799+
"Perhaps you misspelled the source URL being patched.\n\
800800
Possible URLs for `[patch.<URL>]`:",
801801
)?;
802802
for id in ids.iter() {

tests/testsuite/patch.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ fn unused_with_mismatch_source_being_patched() {
431431
"\
432432
[UPDATING] `dummy-registry` index
433433
[WARNING] Patch `bar v0.2.0 ([CWD]/bar)` was not used in the crate graph.
434-
Perhaps you misspell the source URL being patched.
434+
Perhaps you misspelled the source URL being patched.
435435
Possible URLs for `[patch.<URL>]`:
436436
crates-io
437437
[WARNING] Patch `bar v0.3.0 ([CWD]/baz)` was not used in the crate graph.
@@ -1769,7 +1769,7 @@ fn two_semver_compatible() {
17691769
.with_stderr(
17701770
"\
17711771
warning: Patch `bar v0.1.1 [..]` was not used in the crate graph.
1772-
Perhaps you misspell the source URL being patched.
1772+
Perhaps you misspelled the source URL being patched.
17731773
Possible URLs for `[patch.<URL>]`:
17741774
[CWD]/bar
17751775
[FINISHED] [..]",
@@ -1823,7 +1823,7 @@ fn multipatch_select_big() {
18231823
.with_stderr(
18241824
"\
18251825
warning: Patch `bar v0.1.0 [..]` was not used in the crate graph.
1826-
Perhaps you misspell the source URL being patched.
1826+
Perhaps you misspelled the source URL being patched.
18271827
Possible URLs for `[patch.<URL>]`:
18281828
[CWD]/bar
18291829
[FINISHED] [..]",

0 commit comments

Comments
 (0)