From d9592c6a9809fda8b3b3f6c715281b12881d4daa Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 1 Oct 2024 21:06:30 +0200 Subject: [PATCH] TO BE REMOVED: enable merged doctests by default --- src/librustdoc/doctest.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs index e8bd36dffc773..efb22a044c404 100644 --- a/src/librustdoc/doctest.rs +++ b/src/librustdoc/doctest.rs @@ -788,7 +788,8 @@ struct CreateRunnableDocTests { impl CreateRunnableDocTests { fn new(rustdoc_options: RustdocOptions, opts: GlobalTestOptions) -> CreateRunnableDocTests { - let can_merge_doctests = rustdoc_options.edition >= Edition::Edition2024; + // let can_merge_doctests = rustdoc_options.edition >= Edition::Edition2024; + let can_merge_doctests = true; CreateRunnableDocTests { standalone_tests: Vec::new(), mergeable_tests: FxHashMap::default(),