Remove --display-doctest-warnings#91259
Merged
bors merged 1 commit intorust-lang:masterfrom Nov 27, 2021
Merged
Conversation
Member
Do you think you could separate that into its own commit? It'd make it easier to understand what's being changed. |
Member
Author
Not really? This was the fix: diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs
index de4a3732e73..56ccdfae1d8 100644
--- a/src/librustdoc/doctest.rs
+++ b/src/librustdoc/doctest.rs
@@ -208,29 +205,19 @@
Ok(())
}
-crate fn run_tests(
- mut test_args: Vec<String>,
- nocapture: bool,
- display_doctest_warnings: bool,
- tests: Vec<test::TestDescAndFn>,
-) {
+crate fn run_tests(mut test_args: Vec<String>, nocapture: bool, tests: Vec<test::TestDescAndFn>) {
test_args.insert(0, "rustdoctest".to_string());
if nocapture {
test_args.push("--nocapture".to_string());
}
- test::test_main(
- &test_args,
- tests,
- Some(test::Options::new().display_output(display_doctest_warnings)),
- );
+ test::test_main(&test_args, tests, None);
}
The problem was that |
GuillaumeGomez
approved these changes
Nov 26, 2021
Member
|
You even provided the documentation alongside, it's great, thanks! r=me once CI pass |
camelid
reviewed
Nov 26, 2021
7cb32d0 to
b241c15
Compare
Nemo157
reviewed
Nov 26, 2021
This can be replicated in full with other existing features, there's no need to have a separate option for it. This also fixes a bug where `--test-args=--show-output` had no effect, and updates the documentation.
b241c15 to
7e4bf4b
Compare
Member
Author
|
@bors r=GuillaumeGomez |
Collaborator
|
📌 Commit 7e4bf4b has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 27, 2021
…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#90611 (Fix another ICE in rustdoc scrape_examples) - rust-lang#91197 (rustdoc: Rename `Type::ResolvedPath` to `Type::Path` and don't re-export it) - rust-lang#91223 (Fix headings indent) - rust-lang#91240 (Saner formatting for UTF8_CHAR_WIDTH table) - rust-lang#91248 (Bump compiler-builtins to 0.1.53) - rust-lang#91252 (Fix bug where submodules wouldn't be updated when running x.py from a subdirectory) - rust-lang#91259 (Remove `--display-doctest-warnings`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
--display-doctest-warningscan be replicated in full with other existing features, there's noneed to have a separate option for it. This removes the option and documents the combination of other features to replicate it.
This also fixes a bug where
--test-args=--show-outputhad no effect.cc @ollie27, #73314 (comment)
Fixes #41574
r? @GuillaumeGomez