Skip to content
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

rustdoc: Fixes with --test-run-directory and relative paths. #112751

Merged
merged 1 commit into from
Aug 17, 2023

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 18, 2023

Fixes #112191
Fixes #112210

This fixes some issues with --test-run-directory and its interaction with --runtool and --persist-doctests. Relative directories don't work with Command::current_dir very well because it has platform-specific behavior with relative paths. This fixes it by avoiding the use of relative paths.

This is needed because cargo is switching to use --test-run-directory, and it uses relative paths when interacting with rustdoc/rustc.

@rustbot
Copy link
Collaborator

rustbot commented Jun 18, 2023

r? @jsha

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 18, 2023
@jsha
Copy link
Contributor

jsha commented Aug 17, 2023

@bors r+ rollup

Looks good, thanks! And thanks for the thorough descriptions on the linked issues. They really helped to understand what is going on.

@bors
Copy link
Contributor

bors commented Aug 17, 2023

📌 Commit 31e3f56 has been approved by jsha

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 17, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 17, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#112751 (rustdoc: Fixes with --test-run-directory and relative paths.)
 - rust-lang#114749 (Update `mpsc::Sender` doc to reflect that it implements `Sync`)
 - rust-lang#114876 (Don't ICE in `is_trivially_sized` when encountering late-bound self ty)
 - rust-lang#114881 (clarify CStr lack of layout guarnatees)
 - rust-lang#114921 (Remove Folyd from librustdoc static files)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit da54108 into rust-lang:master Aug 17, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
4 participants