-
Notifications
You must be signed in to change notification settings - Fork 13.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove --display-doctest-warnings
#91259
Conversation
Do you think you could separate that into its own commit? It'd make it easier to understand what's being changed. |
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 |
You even provided the documentation alongside, it's great, thanks! r=me once CI pass |
7cb32d0
to
b241c15
Compare
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
@bors r=GuillaumeGomez |
📌 Commit 7e4bf4b has been approved by |
…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
--display-doctest-warnings
can 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-output
had no effect.cc @ollie27, #73314 (comment)
Fixes #41574
r? @GuillaumeGomez