-
Notifications
You must be signed in to change notification settings - Fork 13.3k
rustdoc: Doctest merging: Remove superfluous library search path logic #138436
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Conversation
This PR modifies cc @jieyouxu |
@@ -672,18 +672,6 @@ fn run_test( | |||
"--extern=doctest_bundle_{edition}=", | |||
edition = doctest.edition | |||
)); | |||
for extern_str in &rustdoc_options.extern_strs { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also note for additional context: This didn't apply to doctest-only dependencies "anyway"1 as registered via -Zunstable-options --doctest-compilation-args
as noted here: #137899 (comment)
Footnotes
-
Very unlikely to occur in practice due to Cargo's dominance which doesn't support that. ↩
8a72bc5
to
df78df2
Compare
df78df2
to
1558944
Compare
// Collect and run the doctests inside `doctest.rs`. | ||
// | ||
|
||
for edition in ["2021", "2024"] { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe also explicitly add a "2015" edition, since that IIRC influences extern prelude behavior (in 2015, extern extern_prelude;
is still needed even if you specify --extern
to rustc IIRC).
The job Click to see the possible cause of the failure (guessed by this bot)
|
Clearly not superfluous, I didn't run any rmake tests back in #137899 (comment). Without these extra I'm not sure my new test still pulls its weight with that said despite passing on master, too. I'll close this PR and experiment a bit locally with all of this. |
Implements: #137899 (comment). Abridged:
With
COMPILETEST_FORCE_STAGE0=1 ./x t --stage 0 tests/run-make/doctests-merge-with-deps
you should be able to verify that the test also passes on master.r? notriddle or reassign and no rush