-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Add unstable option to control doctest run directory #81264
Conversation
The job Click to see the possible cause of the failure (guessed by this bot)
|
Interesting, CI actually runs compiletest from the FS root: |
3cde530
to
fcb7183
Compare
The job Click to see the possible cause of the failure (guessed by this bot)
|
fcb7183
to
e3d8171
Compare
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.
Is there a way to control the cwd of compiletest? Lets see if there already is an annotation for that, or if I have to add one…
I don't quite follow, sorry - why do you want to change the cwd?
e3d8171
to
b9d371d
Compare
The job Click to see the possible cause of the failure (guessed by this bot)
|
This option will allow splitting the compile-time from the run-time directory of doctest invocations and is one step to solve rust-lang/cargo#8993 (comment)
b9d371d
to
9b1d27d
Compare
r=me with CI passing. Looks great, thanks :) |
@bors r+ |
📌 Commit 9b1d27d has been approved by |
I think this has caused this build failure: #81343 (comment) @bors r- |
@bors rollup=iffy |
@jonas-schievink wrong rustdoc PR, it was #81197 |
@bors r+ rollup- |
💡 This pull request was already approved, no need to approve it again.
|
📌 Commit 9b1d27d has been approved by |
…as-schievink Rollup of 14 pull requests Successful merges: - rust-lang#75180 (Implement Error for &(impl Error)) - rust-lang#78578 (Permit mutable references in all const contexts) - rust-lang#79174 (Make std::future a re-export of core::future) - rust-lang#79884 (Replace magic numbers with existing constants) - rust-lang#80855 (Expand assert!(expr, args..) to include $crate for hygiene on 2021.) - rust-lang#80933 (Fix sysroot option not being honored across rustc) - rust-lang#81259 (Replace version_check dependency with own version parsing code) - rust-lang#81264 (Add unstable option to control doctest run directory) - rust-lang#81279 (Small refactor in typeck) - rust-lang#81297 (Don't provide backend_optimization_level query for extern crates) - rust-lang#81302 (Fix rendering of stabilization version for trait implementors) - rust-lang#81310 (Do not mark unit variants as used when in path pattern) - rust-lang#81320 (Make bad shlex parsing a pretty error) - rust-lang#81338 (Clean up `dominators_given_rpo`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
By doing so, rustdoc will also emit workspace-relative filenames for the doctests. This was first landed in rust-lang#8954 but later backed out in rust-lang#8996 because it changed the CWD of rustdoc test invocations. The second try relies on the new `--test-run-directory` rustdoc option which was added in rust-lang/rust#81264 to explicitly control the rustdoc test cwd. fixes rust-lang#8993
Run rustdoc doctests relative to the workspace By doing so, rustdoc will also emit workspace-relative filenames for the doctests. This was first landed in #8954 but later backed out in #8996 because it changed the CWD of rustdoc test invocations. The second try relies on the new `--test-run-directory` rustdoc option which was added in rust-lang/rust#81264 to explicitly control the rustdoc test cwd. fixes #8993
This option will allow splitting the compile-time from the run-time
directory of doctest invocations and is one step to solve
rust-lang/cargo#8993 (comment)
r? @jyn514