-
Notifications
You must be signed in to change notification settings - Fork 13.8k
[rustdoc] Correctly handle should_panic
doctest attribute and fix --no-run
test flag on the 2024 edition
#143900
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
base: master
Are you sure you want to change the base?
Conversation
This PR modifies cc @jieyouxu |
This comment has been minimized.
This comment has been minimized.
I... do not see anything like that in the patch? There's two checks for exit code 101. |
Woups, copied/pasted comment from original PR which was outdated after discussion with you (on the previous PR). ^^' EDIT: Updated comment. |
if langstr.should_panic {
if out.status.code() == Some(101) {
return Ok(());
} else if out.status.success() {
return Err(TestFailure::UnexpectedRunPass);
}
}
if !out.status.success() {
return Err(TestFailure::ExecutionFailure(out));
} Do you think something like this would make sense, so that it's easier for the user to differentiate between aborts and panic-less success? |
|
Wouldn't changing |
That wouldn't cover |
I've amended my comment a moment before you replied, apologies. |
Replied too fast then. 😅 The message for |
I think we're talking past each other. I suggest that:
Wouldn't that work? |
I still think it's too general. For end users, |
That makes sense, yeah. Let's delay it until after this PR lands then. |
☔ The latest upstream changes (presumably #144692) made this pull request unmergeable. Please resolve the merge conflicts. |
72aadc6
to
248c61c
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
248c61c
to
c365e6e
Compare
This comment has been minimized.
This comment has been minimized.
…Amanieu Make `libtest::ERROR_EXIT_CODE` const public to not redefine it in rustdoc I think it's better to make this constant public so it can be used by crates using `libtest` as dependency. As a side-note, I will update rust-lang#143900 to make use of this constant once this is current PR is merged.
This comment has been minimized.
This comment has been minimized.
[rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition try-job: test-various
This comment has been minimized.
This comment has been minimized.
💔 Test for 7898e10 failed: CI. Failed jobs:
|
1ee6ba0
to
d53eb91
Compare
@bors try jobs=test-various |
This comment has been minimized.
This comment has been minimized.
[rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition try-job: test-various
This comment has been minimized.
This comment has been minimized.
💔 Test for 47dcc1a failed: CI. Failed jobs:
|
Adding some garbage to see where exactly this code is called. @bors try jobs=test-various |
[rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition try-job: test-various
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
💔 Test for f1ab8b6 failed: CI. Failed jobs:
|
2be418f
to
5664022
Compare
This comment has been minimized.
This comment has been minimized.
5664022
to
0e6bb6c
Compare
@bors try jobs=test-various |
This comment has been minimized.
This comment has been minimized.
[rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition try-job: test-various
💔 Test for 87ea0ed failed: CI. Failed jobs:
|
This comment has been minimized.
This comment has been minimized.
0e6bb6c
to
560d450
Compare
@bors try jobs=test-various |
This comment has been minimized.
This comment has been minimized.
[rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition try-job: test-various
Fixes #143009.
Fixes #143858.
Since it includes fixes from #143453, it's taking it over (commits 2, 3 and 4 are from #143453).
For
--no-run
, we forgot to check the "global" options in the 2024 edition, fixed in the first commit.For
should_panic
fix, the exit code check has been fixed.cc @TroyKomodo (thanks so much for providing such a complete test, made my life a lot easier!)
r? @notriddle