-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Revert #8954 - changing rustdoc's cwd #8996
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
r? @Eh2406 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 18, 2020
cc @Swatinem |
@bors r+ |
📌 Commit 6f49ce6 has been approved by |
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
Dec 18, 2020
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 24, 2020
Update cargo 10 commits in a3c2627fbc2f5391c65ba45ab53b81bf71fa323c..75d5d8cffe3464631f82dcd3c470b78dc1dda8bb 2020-12-14 17:21:26 +0000 to 2020-12-22 18:10:56 +0000 - Update git2 (rust-lang/cargo#9009) - Stabilize RUSTC_WORKSPACE_WRAPPER (rust-lang/cargo#8976) - Make cargo metadata and tree respect target (rust-lang/cargo#8987) - Update git2 (rust-lang/cargo#8998) - Revert rust-lang/cargo#8954 - changing rustdoc's cwd (rust-lang/cargo#8996) - With debug HTTP mode log curl's version (rust-lang/cargo#8991) - Reject ambiguous git dependency declaration. (rust-lang/cargo#8984) - Fix tests not working with a different CARGO_TARGET_DIR. (rust-lang/cargo#8982) - Add version to credential dependencies. (rust-lang/cargo#8983) - Clarify FAQ entry wording about lockfiles (rust-lang/cargo#8978)
Swatinem
added a commit
to Swatinem/cargo
that referenced
this pull request
Feb 22, 2021
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
bors
added a commit
that referenced
this pull request
Feb 23, 2021
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
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR reverts #8954 in reference to #8993 and #8992 where there's still definitely a bug to be fixed but we should probably avoid regressing in the meantime.
Closes #8992