diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2024-06-19 00:16:05 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2024-08-13 20:14:55 +0200 |
| commit | 112e44740e8344a139c551864471544b193a6188 (patch) | |
| tree | e1c46e24ee3c2fd67466f7c09a478436f7aecfca | |
| parent | 0bd2c99ce8a3df2ae734748a69b4dc7644b5db1c (diff) | |
| download | rust-112e44740e8344a139c551864471544b193a6188.tar.gz rust-112e44740e8344a139c551864471544b193a6188.zip | |
Disable merged doctests by default
| -rw-r--r-- | src/librustdoc/doctest.rs | 2 | ||||
| -rw-r--r-- | tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs index 7028666371b..74ccc7a871b 100644 --- a/src/librustdoc/doctest.rs +++ b/src/librustdoc/doctest.rs @@ -772,7 +772,7 @@ struct CreateRunnableDoctests { impl CreateRunnableDoctests { fn new(rustdoc_options: RustdocOptions, opts: GlobalTestOptions) -> CreateRunnableDoctests { - let can_merge_doctests = true; //rustdoc_options.edition >= Edition::Edition2024; + let can_merge_doctests = rustdoc_options.edition >= Edition::Edition2024; CreateRunnableDoctests { standalone_tests: Vec::new(), mergeable_tests: FxHashMap::default(), diff --git a/tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout b/tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout index 71b0b10fa72..cb3456e087e 100644 --- a/tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout +++ b/tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout @@ -5,7 +5,6 @@ test $DIR/failed-doctest-should-panic.rs - Foo (line 9) - should panic ... FAILE failures: ---- $DIR/failed-doctest-should-panic.rs - Foo (line 9) stdout ---- -Hello, world! note: test did not panic as expected failures: |