Skip to content

Commit 748cbea

Browse files
borsbors
committed
Auto merge of #5851 - dwijnand:slash-macro, r=alexcrichton
Drop the [/] test output macro Refs #5742
2 parents 4477355 + 5071b38 commit 748cbea

30 files changed

+648
-648
lines changed

‎tests/testsuite/bad_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ fn bad_cargo_config_jobs() {
155155
p.cargo("build").arg("-v"),
156156
execs().with_status(101).with_stderr(
157157
"\
158-
[ERROR] error in [..].cargo[/]config: \
158+
[ERROR] error in [..].cargo/config: \
159159
could not load config key `build.jobs`: \
160160
invalid value: integer `-1`, expected u32
161161
",

‎tests/testsuite/bench.rs

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn cargo_bench_simple() {
4848
"\
4949
[COMPILING] foo v0.5.0 ({})
5050
[FINISHED] release [optimized] target(s) in [..]
51-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
51+
[RUNNING] target/release/deps/foo-[..][EXE]",
5252
p.url()
5353
))
5454
.with_stdout_contains("test bench_hello ... bench: [..]"),
@@ -95,8 +95,8 @@ fn bench_bench_implicit() {
9595
"\
9696
[COMPILING] foo v0.0.1 ({dir})
9797
[FINISHED] release [optimized] target(s) in [..]
98-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
99-
[RUNNING] target[/]release[/]deps[/]mybench-[..][EXE]
98+
[RUNNING] target/release/deps/foo-[..][EXE]
99+
[RUNNING] target/release/deps/mybench-[..][EXE]
100100
",
101101
dir = p.url()
102102
))
@@ -144,7 +144,7 @@ fn bench_bin_implicit() {
144144
"\
145145
[COMPILING] foo v0.0.1 ({dir})
146146
[FINISHED] release [optimized] target(s) in [..]
147-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
147+
[RUNNING] target/release/deps/foo-[..][EXE]
148148
",
149149
dir = p.url()
150150
))
@@ -183,7 +183,7 @@ fn bench_tarname() {
183183
"\
184184
[COMPILING] foo v0.0.1 ({dir})
185185
[FINISHED] release [optimized] target(s) in [..]
186-
[RUNNING] target[/]release[/]deps[/]bin2-[..][EXE]
186+
[RUNNING] target/release/deps/bin2-[..][EXE]
187187
",
188188
dir = p.url()
189189
))
@@ -261,9 +261,9 @@ fn cargo_bench_verbose() {
261261
.with_stderr(&format!(
262262
"\
263263
[COMPILING] foo v0.5.0 ({url})
264-
[RUNNING] `rustc [..] src[/]main.rs [..]`
264+
[RUNNING] `rustc [..] src/main.rs [..]`
265265
[FINISHED] release [optimized] target(s) in [..]
266-
[RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] hello --bench`",
266+
[RUNNING] `[..]target/release/deps/foo-[..][EXE] hello --bench`",
267267
url = p.url()
268268
))
269269
.with_stdout_contains("test bench_hello ... bench: [..]"),
@@ -372,15 +372,15 @@ fn cargo_bench_failing_test() {
372372
"\
373373
[COMPILING] foo v0.5.0 ({})[..]
374374
[FINISHED] release [optimized] target(s) in [..]
375-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
375+
[RUNNING] target/release/deps/foo-[..][EXE]",
376376
p.url()
377377
))
378378
.with_either_contains(
379379
"[..]thread '[..]' panicked at 'assertion failed: `(left == right)`[..]",
380380
)
381381
.with_either_contains("[..]left: `\"hello\"`[..]")
382382
.with_either_contains("[..]right: `\"nope\"`[..]")
383-
.with_either_contains("[..]src[/]main.rs:15[..]")
383+
.with_either_contains("[..]src/main.rs:15[..]")
384384
.with_status(101),
385385
);
386386
}
@@ -447,8 +447,8 @@ fn bench_with_lib_dep() {
447447
"\
448448
[COMPILING] foo v0.0.1 ({})
449449
[FINISHED] release [optimized] target(s) in [..]
450-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
451-
[RUNNING] target[/]release[/]deps[/]baz-[..][EXE]",
450+
[RUNNING] target/release/deps/foo-[..][EXE]
451+
[RUNNING] target/release/deps/baz-[..][EXE]",
452452
p.url()
453453
))
454454
.with_stdout_contains("test lib_bench ... bench: [..]")
@@ -515,7 +515,7 @@ fn bench_with_deep_lib_dep() {
515515
[COMPILING] foo v0.0.1 ([..])
516516
[COMPILING] bar v0.0.1 ({dir})
517517
[FINISHED] release [optimized] target(s) in [..]
518-
[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]",
518+
[RUNNING] target/release/deps/bar-[..][EXE]",
519519
dir = p.url()
520520
))
521521
.with_stdout_contains("test bar_bench ... bench: [..]"),
@@ -575,8 +575,8 @@ fn external_bench_explicit() {
575575
"\
576576
[COMPILING] foo v0.0.1 ({})
577577
[FINISHED] release [optimized] target(s) in [..]
578-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
579-
[RUNNING] target[/]release[/]deps[/]bench-[..][EXE]",
578+
[RUNNING] target/release/deps/foo-[..][EXE]
579+
[RUNNING] target/release/deps/bench-[..][EXE]",
580580
p.url()
581581
))
582582
.with_stdout_contains("test internal_bench ... bench: [..]")
@@ -625,8 +625,8 @@ fn external_bench_implicit() {
625625
"\
626626
[COMPILING] foo v0.0.1 ({})
627627
[FINISHED] release [optimized] target(s) in [..]
628-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
629-
[RUNNING] target[/]release[/]deps[/]external-[..][EXE]",
628+
[RUNNING] target/release/deps/foo-[..][EXE]
629+
[RUNNING] target/release/deps/external-[..][EXE]",
630630
p.url()
631631
))
632632
.with_stdout_contains("test internal_bench ... bench: [..]")
@@ -707,7 +707,7 @@ For more information on this warning you can consult
707707
https://github.com/rust-lang/cargo/issues/5330
708708
[COMPILING] foo v0.0.1 ({})
709709
[FINISHED] release [optimized] target(s) in [..]
710-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
710+
[RUNNING] target/release/deps/foo-[..][EXE]
711711
",
712712
p.url()
713713
)),
@@ -758,7 +758,7 @@ fn pass_through_command_line() {
758758
"\
759759
[COMPILING] foo v0.0.1 ({dir})
760760
[FINISHED] release [optimized] target(s) in [..]
761-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
761+
[RUNNING] target/release/deps/foo-[..][EXE]",
762762
dir = p.url()
763763
))
764764
.with_stdout_contains("test bar ... bench: [..]"),
@@ -770,7 +770,7 @@ fn pass_through_command_line() {
770770
.with_status(0)
771771
.with_stderr(
772772
"[FINISHED] release [optimized] target(s) in [..]
773-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
773+
[RUNNING] target/release/deps/foo-[..][EXE]",
774774
)
775775
.with_stdout_contains("test foo ... bench: [..]"),
776776
);
@@ -859,8 +859,8 @@ fn lib_bin_same_name() {
859859
"\
860860
[COMPILING] foo v0.0.1 ({})
861861
[FINISHED] release [optimized] target(s) in [..]
862-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
863-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
862+
[RUNNING] target/release/deps/foo-[..][EXE]
863+
[RUNNING] target/release/deps/foo-[..][EXE]",
864864
p.url()
865865
))
866866
.with_stdout_contains_n("test [..] ... bench: [..]", 2),
@@ -912,8 +912,8 @@ fn lib_with_standard_name() {
912912
"\
913913
[COMPILING] syntax v0.0.1 ({dir})
914914
[FINISHED] release [optimized] target(s) in [..]
915-
[RUNNING] target[/]release[/]deps[/]syntax-[..][EXE]
916-
[RUNNING] target[/]release[/]deps[/]bench-[..][EXE]",
915+
[RUNNING] target/release/deps/syntax-[..][EXE]
916+
[RUNNING] target/release/deps/bench-[..][EXE]",
917917
dir = p.url()
918918
))
919919
.with_stdout_contains("test foo_bench ... bench: [..]")
@@ -968,7 +968,7 @@ fn lib_with_standard_name2() {
968968
"\
969969
[COMPILING] syntax v0.0.1 ({dir})
970970
[FINISHED] release [optimized] target(s) in [..]
971-
[RUNNING] target[/]release[/]deps[/]syntax-[..][EXE]",
971+
[RUNNING] target/release/deps/syntax-[..][EXE]",
972972
dir = p.url()
973973
))
974974
.with_stdout_contains("test bench ... bench: [..]"),
@@ -1052,8 +1052,8 @@ fn bench_dylib() {
10521052
[RUNNING] [..] -C opt-level=3 [..]
10531053
[RUNNING] [..] -C opt-level=3 [..]
10541054
[FINISHED] release [optimized] target(s) in [..]
1055-
[RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] --bench`
1056-
[RUNNING] `[..]target[/]release[/]deps[/]bench-[..][EXE] --bench`",
1055+
[RUNNING] `[..]target/release/deps/foo-[..][EXE] --bench`
1056+
[RUNNING] `[..]target/release/deps/bench-[..][EXE] --bench`",
10571057
dir = p.url()
10581058
))
10591059
.with_stdout_contains_n("test foo ... bench: [..]", 2),
@@ -1069,8 +1069,8 @@ fn bench_dylib() {
10691069
[FRESH] bar v0.0.1 ({dir}/bar)
10701070
[FRESH] foo v0.0.1 ({dir})
10711071
[FINISHED] release [optimized] target(s) in [..]
1072-
[RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] --bench`
1073-
[RUNNING] `[..]target[/]release[/]deps[/]bench-[..][EXE] --bench`",
1072+
[RUNNING] `[..]target/release/deps/foo-[..][EXE] --bench`
1073+
[RUNNING] `[..]target/release/deps/bench-[..][EXE] --bench`",
10741074
dir = p.url()
10751075
))
10761076
.with_stdout_contains_n("test foo ... bench: [..]", 2),
@@ -1115,7 +1115,7 @@ fn bench_twice_with_build_cmd() {
11151115
"\
11161116
[COMPILING] foo v0.0.1 ({dir})
11171117
[FINISHED] release [optimized] target(s) in [..]
1118-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
1118+
[RUNNING] target/release/deps/foo-[..][EXE]",
11191119
dir = p.url()
11201120
))
11211121
.with_stdout_contains("test foo ... bench: [..]"),
@@ -1127,7 +1127,7 @@ fn bench_twice_with_build_cmd() {
11271127
.with_status(0)
11281128
.with_stderr(
11291129
"[FINISHED] release [optimized] target(s) in [..]
1130-
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
1130+
[RUNNING] target/release/deps/foo-[..][EXE]",
11311131
)
11321132
.with_stdout_contains("test foo ... bench: [..]"),
11331133
);
@@ -1215,8 +1215,8 @@ fn bench_with_examples() {
12151215
[RUNNING] `rustc [..]`
12161216
[RUNNING] `rustc [..]`
12171217
[FINISHED] release [optimized] target(s) in [..]
1218-
[RUNNING] `{dir}[/]target[/]release[/]deps[/]foo-[..][EXE] --bench`
1219-
[RUNNING] `{dir}[/]target[/]release[/]deps[/]testb1-[..][EXE] --bench`",
1218+
[RUNNING] `{dir}/target/release/deps/foo-[..][EXE] --bench`
1219+
[RUNNING] `{dir}/target/release/deps/testb1-[..][EXE] --bench`",
12201220
dir = p.root().display(),
12211221
url = p.url()
12221222
))
@@ -1262,7 +1262,7 @@ fn test_a_bench() {
12621262
"\
12631263
[COMPILING] foo v0.1.0 ([..])
12641264
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
1265-
[RUNNING] target[/]debug[/]deps[/]b-[..][EXE]",
1265+
[RUNNING] target/debug/deps/b-[..][EXE]",
12661266
)
12671267
.with_stdout_contains("test foo ... ok"),
12681268
);
@@ -1343,9 +1343,9 @@ fn test_bench_no_fail_fast() {
13431343
.arg("--test-threads=1"),
13441344
execs()
13451345
.with_status(101)
1346-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]")
1346+
.with_stderr_contains("[RUNNING] target/release/deps/foo-[..][EXE]")
13471347
.with_stdout_contains("running 2 tests")
1348-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]")
1348+
.with_stderr_contains("[RUNNING] target/release/deps/foo-[..][EXE]")
13491349
.with_stdout_contains("test bench_hello [..]")
13501350
.with_stdout_contains("test bench_nope [..]"),
13511351
);
@@ -1438,9 +1438,9 @@ fn test_bench_multiple_packages() {
14381438
p.cargo("bench").arg("-p").arg("bar").arg("-p").arg("baz"),
14391439
execs()
14401440
.with_status(0)
1441-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bbaz-[..][EXE]")
1441+
.with_stderr_contains("[RUNNING] target/release/deps/bbaz-[..][EXE]")
14421442
.with_stdout_contains("test bench_baz ... bench: [..]")
1443-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bbar-[..][EXE]")
1443+
.with_stderr_contains("[RUNNING] target/release/deps/bbar-[..][EXE]")
14441444
.with_stdout_contains("test bench_bar ... bench: [..]"),
14451445
);
14461446
}
@@ -1498,9 +1498,9 @@ fn bench_all_workspace() {
14981498
p.cargo("bench").arg("--all"),
14991499
execs()
15001500
.with_status(0)
1501-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]")
1501+
.with_stderr_contains("[RUNNING] target/release/deps/bar-[..][EXE]")
15021502
.with_stdout_contains("test bench_bar ... bench: [..]")
1503-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]")
1503+
.with_stderr_contains("[RUNNING] target/release/deps/foo-[..][EXE]")
15041504
.with_stdout_contains("test bench_foo ... bench: [..]"),
15051505
);
15061506
}
@@ -1601,9 +1601,9 @@ fn bench_all_virtual_manifest() {
16011601
p.cargo("bench").arg("--all"),
16021602
execs()
16031603
.with_status(0)
1604-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]baz-[..][EXE]")
1604+
.with_stderr_contains("[RUNNING] target/release/deps/baz-[..][EXE]")
16051605
.with_stdout_contains("test bench_baz ... bench: [..]")
1606-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]")
1606+
.with_stderr_contains("[RUNNING] target/release/deps/bar-[..][EXE]")
16071607
.with_stdout_contains("test bench_bar ... bench: [..]"),
16081608
);
16091609
}
@@ -1646,7 +1646,7 @@ fn legacy_bench_name() {
16461646
p.cargo("bench"),
16471647
execs().with_status(0).with_stderr_contains(
16481648
"\
1649-
[WARNING] path `[..]src[/]bench.rs` was erroneously implicitly accepted for benchmark `bench`,
1649+
[WARNING] path `[..]src/bench.rs` was erroneously implicitly accepted for benchmark `bench`,
16501650
please set bench.path in Cargo.toml",
16511651
),
16521652
);
@@ -1698,9 +1698,9 @@ fn bench_virtual_manifest_all_implied() {
16981698
p.cargo("bench"),
16991699
execs()
17001700
.with_status(0)
1701-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]baz-[..][EXE]")
1701+
.with_stderr_contains("[RUNNING] target/release/deps/baz-[..][EXE]")
17021702
.with_stdout_contains("test bench_baz ... bench: [..]")
1703-
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]")
1703+
.with_stderr_contains("[RUNNING] target/release/deps/bar-[..][EXE]")
17041704
.with_stdout_contains("test bench_bar ... bench: [..]"),
17051705
);
17061706
}

0 commit comments

Comments
 (0)