Skip to content

Commit ad333ec

Browse files
committed
Update doctest xcompile flags
This updates the flags used for doctest xcompile to match the upstream changes in rust-lang/rust#137096 which renamed and stabilized the flags.
1 parent 872b92e commit ad333ec

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/cargo/ops/cargo_test.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,10 @@ fn run_doc_tests(
238238
}
239239

240240
if doctest_xcompile {
241-
p.arg("-Zunstable-options");
242-
p.arg("--enable-per-target-ignores");
243241
if let Some((runtool, runtool_args)) = compilation.target_runner(unit.kind) {
244-
p.arg("--runtool").arg(runtool);
242+
p.arg("--test-runtool").arg(runtool);
245243
for arg in runtool_args {
246-
p.arg("--runtool-arg").arg(arg);
244+
p.arg("--test-runtool-arg").arg(arg);
247245
}
248246
}
249247
if let Some(linker) = linker {

src/doc/src/reference/unstable.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,7 @@ This flag changes `cargo test`'s behavior when handling doctests when
285285
a target is passed. Currently, if a target is passed that is different
286286
from the host cargo will simply skip testing doctests. If this flag is
287287
present, cargo will continue as normal, passing the tests to doctest,
288-
while also passing it a `--target` option, as well as enabling
289-
`-Zunstable-features --enable-per-target-ignores` and passing along
288+
while also passing it a `--target` option, as well as passing along
290289
information from `.cargo/config.toml`. See the rustc issue for more information.
291290

292291
```sh

0 commit comments

Comments
 (0)