Use a crate to produce rustdoc tree comparisons instead of the diff command#82469
Merged
bors merged 1 commit intorust-lang:masterfrom Mar 3, 2021
Merged
Use a crate to produce rustdoc tree comparisons instead of the diff command#82469bors merged 1 commit intorust-lang:masterfrom
diff command#82469bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
Contributor
|
Maybe it'd be worth replacing the other diff function too, if |
Contributor
Author
|
I expect both of them would produce very similar results, but slightly differently formatted. I don't want to reformat all of the MIR diff files in the test suite. That sounds like a lot of churn for nothing. I also don't want to break people's custom diff viewers that they're using for the rustdoc diff, which is why it doesn't just use the existing diff tool for it. |
Member
|
r=me with commits squashed a bit |
… command It doesn't exist on Windows, so we bring our own unified diff implementation. Fixes rust-lang#82409
433078e to
b29d9d5
Compare
Contributor
Author
|
Okay, it's been rebased and squashed. @Mark-Simulacrum |
Member
|
@bors r+ |
Collaborator
|
📌 Commit b29d9d5 has been approved by |
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 2, 2021
…k-Simulacrum Use a crate to produce rustdoc tree comparisons instead of the `diff` command It doesn't come with Windows, so bring [our own](https://github.com/notriddle/rust-unified-diff/). Fixes rust-lang#82409 
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 3, 2021
…k-Simulacrum Use a crate to produce rustdoc tree comparisons instead of the `diff` command It doesn't come with Windows, so bring [our own](https://github.com/notriddle/rust-unified-diff/). Fixes rust-lang#82409 
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 3, 2021
Rollup of 10 pull requests Successful merges: - rust-lang#81223 ([rustdoc] Generate redirect map file) - rust-lang#82439 (BTree: fix untrue safety) - rust-lang#82469 (Use a crate to produce rustdoc tree comparisons instead of the `diff` command) - rust-lang#82589 (unix: Non-mutable bufs in send_vectored_with_ancillary_to) - rust-lang#82689 (meta: Notify Zulip for rustdoc nominated issues) - rust-lang#82695 (Revert non-power-of-two vector restriction) - rust-lang#82706 (use outer_expn_data() instead of outer_expn().expn_data()) - rust-lang#82710 (FloatToInit: Replacing round_unchecked_to --> to_int_unchecked) - rust-lang#82712 (Remove unnecessary conditional `cfg(target_os)` for `redox` and `vxworks`) - rust-lang#82713 (Update cargo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
It doesn't come with Windows, so bring our own.
Fixes #82409