Skip to content

Commit 31eda6f

Browse files
borsbors
committed
Auto merge of #12363 - BartMassey-upstream:unspecifead, r=ehuss
Correct unspecifiead to unspecified This patch just corrects a small spelling error.
2 parents da4f189 + b9bee52 commit 31eda6f

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

‎src/cargo/util/toml/embedded.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fn expand_manifest_(
8484
.or_insert_with(|| toml::Value::String(DEFAULT_VERSION.to_owned()));
8585
package.entry("edition".to_owned()).or_insert_with(|| {
8686
let _ = config.shell().warn(format_args!(
87-
"`package.edition` is unspecifiead, defaulting to `{}`",
87+
"`package.edition` is unspecified, defaulting to `{}`",
8888
DEFAULT_EDITION
8989
));
9090
toml::Value::String(DEFAULT_EDITION.to_string())

‎tests/testsuite/script.rs

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ args: []
3535
)
3636
.with_stderr(
3737
"\
38-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
38+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
3939
[COMPILING] echo v0.0.0 ([ROOT]/foo)
4040
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
4141
[RUNNING] `[..]/debug/echo[EXE]`
@@ -59,7 +59,7 @@ args: []
5959
)
6060
.with_stderr(
6161
"\
62-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
62+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
6363
[COMPILING] echo v0.0.0 ([ROOT]/foo)
6464
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
6565
[RUNNING] `[..]/debug/echo[EXE]`
@@ -136,7 +136,7 @@ args: []
136136
)
137137
.with_stderr(
138138
"\
139-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
139+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
140140
[COMPILING] echo v0.0.0 ([ROOT]/foo)
141141
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
142142
[RUNNING] `[..]/debug/echo[EXE]`
@@ -260,7 +260,7 @@ fn main() {
260260
)
261261
.with_stderr(
262262
"\
263-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
263+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
264264
[COMPILING] script v0.0.0 ([ROOT]/foo)
265265
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
266266
[RUNNING] `[..]/debug/script[EXE]`
@@ -289,7 +289,7 @@ fn main() {
289289
)
290290
.with_stderr(
291291
"\
292-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
292+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
293293
[COMPILING] script v0.0.0 ([ROOT]/foo)
294294
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
295295
[RUNNING] `[..]/debug/script[EXE]`
@@ -306,7 +306,7 @@ fn main() {
306306
)
307307
.with_stderr(
308308
"\
309-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
309+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
310310
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
311311
[RUNNING] `[..]/debug/script[EXE]`
312312
",
@@ -323,7 +323,7 @@ fn main() {
323323
)
324324
.with_stderr(
325325
"\
326-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
326+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
327327
[COMPILING] script v0.0.0 ([ROOT]/foo)
328328
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
329329
[RUNNING] `[..]/debug/script[EXE]`
@@ -435,7 +435,7 @@ fn main() {
435435
)
436436
.with_stderr(
437437
"\
438-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
438+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
439439
[COMPILING] script v0.0.0 ([ROOT]/foo)
440440
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
441441
[RUNNING] `[..]/debug/script[EXE]`
@@ -460,7 +460,7 @@ args: ["-NotAnArg"]
460460
)
461461
.with_stderr(
462462
"\
463-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
463+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
464464
[COMPILING] script v0.0.0 ([ROOT]/foo)
465465
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
466466
[RUNNING] `[..]/debug/script[EXE] -NotAnArg`
@@ -485,7 +485,7 @@ args: ["-NotAnArg"]
485485
)
486486
.with_stderr(
487487
"\
488-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
488+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
489489
[COMPILING] script v0.0.0 ([ROOT]/foo)
490490
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
491491
[RUNNING] `[..]/debug/script[EXE] -NotAnArg`
@@ -510,7 +510,7 @@ args: ["--help"]
510510
)
511511
.with_stderr(
512512
"\
513-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
513+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
514514
[COMPILING] script v0.0.0 ([ROOT]/foo)
515515
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
516516
[RUNNING] `[..]/debug/script[EXE] --help`
@@ -534,7 +534,7 @@ args: []
534534
"#,
535535
)
536536
.with_stderr(
537-
r#"[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
537+
r#"[WARNING] `package.edition` is unspecified, defaulting to `2021`
538538
[COMPILING] s-h-w-c- v0.0.0 ([ROOT]/foo)
539539
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
540540
[RUNNING] `[..]/debug/s-h-w-c-[EXE]`
@@ -558,7 +558,7 @@ args: []
558558
"#,
559559
)
560560
.with_stderr(
561-
r#"[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
561+
r#"[WARNING] `package.edition` is unspecified, defaulting to `2021`
562562
[COMPILING] answer v0.0.0 ([ROOT]/foo)
563563
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
564564
[RUNNING] `[..]/debug/answer[EXE]`
@@ -580,7 +580,7 @@ args: []
580580
"#,
581581
)
582582
.with_stderr(
583-
r#"[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
583+
r#"[WARNING] `package.edition` is unspecified, defaulting to `2021`
584584
[COMPILING] package v0.0.0 ([ROOT]/foo)
585585
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
586586
[RUNNING] `[..]/debug/package[EXE]`
@@ -646,7 +646,7 @@ fn main() {
646646
)
647647
.with_stderr(
648648
"\
649-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
649+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
650650
[UPDATING] `dummy-registry` index
651651
[DOWNLOADING] crates ...
652652
[DOWNLOADED] script v1.0.0 (registry `dummy-registry`)
@@ -686,7 +686,7 @@ fn main() {
686686
)
687687
.with_stderr(
688688
"\
689-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
689+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
690690
[COMPILING] bar v0.0.1 ([ROOT]/foo/bar)
691691
[COMPILING] script v0.0.0 ([ROOT]/foo)
692692
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
@@ -716,7 +716,7 @@ fn main() {
716716
)
717717
.with_stderr(
718718
"\
719-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
719+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
720720
[COMPILING] script v0.0.0 ([ROOT]/foo)
721721
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
722722
[RUNNING] `[..]/debug/script[EXE] --help`
@@ -745,7 +745,7 @@ fn main() {
745745
)
746746
.with_stderr(
747747
"\
748-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
748+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
749749
[COMPILING] script v0.0.0 ([ROOT]/foo)
750750
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
751751
[RUNNING] `[..]/debug/script[EXE] --help`
@@ -770,7 +770,7 @@ args: []
770770
)
771771
.with_stderr(
772772
"\
773-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
773+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
774774
[COMPILING] script v0.0.0 ([ROOT]/foo)
775775
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
776776
[RUNNING] `[ROOT]/home/.cargo/target/[..]/debug/script[EXE]`
@@ -798,7 +798,7 @@ args: []
798798
)
799799
.with_stderr(
800800
"\
801-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
801+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
802802
[COMPILING] script v0.0.0 ([ROOT]/foo)
803803
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
804804
[RUNNING] `[ROOT]/home/.cargo/target/[..]/debug/script[EXE]`
@@ -861,7 +861,7 @@ fn cmd_check_with_embedded() {
861861
)
862862
.with_stderr(
863863
"\
864-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
864+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
865865
[CHECKING] script v0.0.0 ([ROOT]/foo)
866866
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
867867
",
@@ -922,7 +922,7 @@ fn cmd_build_with_embedded() {
922922
)
923923
.with_stderr(
924924
"\
925-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
925+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
926926
[COMPILING] script v0.0.0 ([ROOT]/foo)
927927
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
928928
",
@@ -950,7 +950,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
950950
)
951951
.with_stderr(
952952
"\
953-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
953+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
954954
[COMPILING] script v0.0.0 ([ROOT]/foo)
955955
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]s
956956
[RUNNING] unittests script.rs ([..])
@@ -979,7 +979,7 @@ fn cmd_clean_with_embedded() {
979979
)
980980
.with_stderr(
981981
"\
982-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
982+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
983983
",
984984
)
985985
.run();
@@ -1000,7 +1000,7 @@ fn cmd_generate_lockfile_with_embedded() {
10001000
)
10011001
.with_stderr(
10021002
"\
1003-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1003+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
10041004
",
10051005
)
10061006
.run();
@@ -1085,7 +1085,7 @@ fn cmd_metadata_with_embedded() {
10851085
)
10861086
.with_stderr(
10871087
"\
1088-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1088+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
10891089
",
10901090
)
10911091
.run();
@@ -1141,7 +1141,7 @@ fn cmd_read_manifest_with_embedded() {
11411141
)
11421142
.with_stderr(
11431143
"\
1144-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1144+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
11451145
",
11461146
)
11471147
.run();
@@ -1162,7 +1162,7 @@ args: []
11621162
)
11631163
.with_stderr(
11641164
"\
1165-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1165+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
11661166
[COMPILING] script v0.0.0 ([ROOT]/foo)
11671167
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
11681168
[RUNNING] `[..]/debug/script[EXE]`
@@ -1186,7 +1186,7 @@ script v0.0.0 ([ROOT]/foo)
11861186
)
11871187
.with_stderr(
11881188
"\
1189-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1189+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
11901190
",
11911191
)
11921192
.run();
@@ -1206,7 +1206,7 @@ fn cmd_update_with_embedded() {
12061206
)
12071207
.with_stderr(
12081208
"\
1209-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1209+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
12101210
",
12111211
)
12121212
.run();
@@ -1223,7 +1223,7 @@ fn cmd_verify_project_with_embedded() {
12231223
.with_json(r#"{"success":"true"}"#)
12241224
.with_stderr(
12251225
"\
1226-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1226+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
12271227
",
12281228
)
12291229
.run();
@@ -1240,7 +1240,7 @@ fn cmd_pkgid_with_embedded() {
12401240
.with_status(101)
12411241
.with_stderr(
12421242
"\
1243-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1243+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
12441244
[ERROR] [ROOT]/foo/script.rs is unsupported by `cargo pkgid`
12451245
",
12461246
)
@@ -1258,7 +1258,7 @@ fn cmd_package_with_embedded() {
12581258
.with_status(101)
12591259
.with_stderr(
12601260
"\
1261-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1261+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
12621262
[ERROR] [ROOT]/foo/script.rs is unsupported by `cargo package`
12631263
",
12641264
)
@@ -1276,7 +1276,7 @@ fn cmd_publish_with_embedded() {
12761276
.with_status(101)
12771277
.with_stderr(
12781278
"\
1279-
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
1279+
[WARNING] `package.edition` is unspecified, defaulting to `2021`
12801280
[ERROR] [ROOT]/foo/script.rs is unsupported by `cargo publish`
12811281
",
12821282
)

0 commit comments

Comments
 (0)