Skip to content

Commit 265f93e

Browse files
committed
test(toml): Be consistent on expected output formatting
1 parent d210644 commit 265f93e

File tree

1 file changed

+39
-16
lines changed

1 file changed

+39
-16
lines changed

tests/testsuite/bad_config.rs

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -835,8 +835,11 @@ fn dev_dependencies2_conflict() {
835835
.build();
836836
p.cargo("check")
837837
.with_stderr_contains(
838-
"[WARNING] conflicting between `dev-dependencies` and `dev_dependencies` in the `foo` package.\n
839-
`dev_dependencies` is ignored and not recommended for use in the future"
838+
"\
839+
[WARNING] conflicting between `dev-dependencies` and `dev_dependencies` in the `foo` package.
840+
841+
`dev_dependencies` is ignored and not recommended for use in the future
842+
",
840843
)
841844
.run();
842845
}
@@ -872,8 +875,11 @@ fn build_dependencies2_conflict() {
872875
.build();
873876
p.cargo("check")
874877
.with_stderr_contains(
875-
"[WARNING] conflicting between `build-dependencies` and `build_dependencies` in the `foo` package.\n
876-
`build_dependencies` is ignored and not recommended for use in the future"
878+
"\
879+
[WARNING] conflicting between `build-dependencies` and `build_dependencies` in the `foo` package.
880+
881+
`build_dependencies` is ignored and not recommended for use in the future
882+
",
877883
)
878884
.run();
879885
}
@@ -900,8 +906,11 @@ fn lib_crate_type2_conflict() {
900906
.build();
901907
p.cargo("check")
902908
.with_stderr_contains(
903-
"[WARNING] conflicting between `crate-type` and `crate_type` in the `foo` library target.\n
904-
`crate_type` is ignored and not recommended for use in the future",
909+
"\
910+
[WARNING] conflicting between `crate-type` and `crate_type` in the `foo` library target.
911+
912+
`crate_type` is ignored and not recommended for use in the future
913+
",
905914
)
906915
.run();
907916
}
@@ -947,9 +956,11 @@ fn examples_crate_type2_conflict() {
947956
p.cargo("check")
948957
.with_stderr_contains(
949958
"\
950-
[WARNING] conflicting between `crate-type` and `crate_type` in the `ex` example target.\n
959+
[WARNING] conflicting between `crate-type` and `crate_type` in the `ex` example target.
960+
951961
`crate_type` is ignored and not recommended for use in the future
952-
[WARNING] conflicting between `crate-type` and `crate_type` in the `goodbye` example target.\n
962+
[WARNING] conflicting between `crate-type` and `crate_type` in the `goodbye` example target.
963+
953964
`crate_type` is ignored and not recommended for use in the future",
954965
)
955966
.run();
@@ -989,8 +1000,11 @@ fn cargo_platform_build_dependencies2_conflict() {
9891000

9901001
p.cargo("check")
9911002
.with_stderr_contains(
992-
format!("[WARNING] conflicting between `build-dependencies` and `build_dependencies` in the `{}` platform target.\n
993-
`build_dependencies` is ignored and not recommended for use in the future", host)
1003+
format!("\
1004+
[WARNING] conflicting between `build-dependencies` and `build_dependencies` in the `{host}` platform target.
1005+
1006+
`build_dependencies` is ignored and not recommended for use in the future
1007+
")
9941008
)
9951009
.run();
9961010
}
@@ -1028,8 +1042,11 @@ fn cargo_platform_dev_dependencies2_conflict() {
10281042

10291043
p.cargo("check")
10301044
.with_stderr_contains(
1031-
format!("[WARNING] conflicting between `dev-dependencies` and `dev_dependencies` in the `{}` platform target.\n
1032-
`dev_dependencies` is ignored and not recommended for use in the future", host)
1045+
format!("\
1046+
[WARNING] conflicting between `dev-dependencies` and `dev_dependencies` in the `{host}` platform target.
1047+
1048+
`dev_dependencies` is ignored and not recommended for use in the future
1049+
")
10331050
)
10341051
.run();
10351052
}
@@ -1070,8 +1087,11 @@ fn default_features2_conflict() {
10701087

10711088
p.cargo("check")
10721089
.with_stderr_contains(
1073-
"[WARNING] conflicting between `default-features` and `default_features` in the `a` dependency.\n
1074-
`default_features` is ignored and not recommended for use in the future"
1090+
"\
1091+
[WARNING] conflicting between `default-features` and `default_features` in the `a` dependency.
1092+
1093+
`default_features` is ignored and not recommended for use in the future
1094+
",
10751095
)
10761096
.run();
10771097
}
@@ -1096,8 +1116,11 @@ fn proc_macro2_conflict() {
10961116

10971117
foo.cargo("check")
10981118
.with_stderr_contains(
1099-
"[WARNING] conflicting between `proc-macro` and `proc_macro` in the `foo` library target.\n
1100-
`proc_macro` is ignored and not recommended for use in the future",
1119+
"\
1120+
[WARNING] conflicting between `proc-macro` and `proc_macro` in the `foo` library target.
1121+
1122+
`proc_macro` is ignored and not recommended for use in the future
1123+
",
11011124
)
11021125
.run();
11031126
}

0 commit comments

Comments
 (0)