-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Use a crate to produce rustdoc tree comparisons instead of the diff
command
#82469
Conversation
(rust-highfive has picked a reviewer for you, use r? to override) |
Maybe it'd be worth replacing the other diff function too, if |
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. |
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
Okay, it's been rebased and squashed. @Mark-Simulacrum |
@bors r+ |
📌 Commit b29d9d5 has been approved by |
…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 ![image](https://user-images.githubusercontent.com/1593513/109230755-9a1d5700-7782-11eb-8359-353a506875ab.png)
…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 ![image](https://user-images.githubusercontent.com/1593513/109230755-9a1d5700-7782-11eb-8359-353a506875ab.png)
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
It doesn't come with Windows, so bring our own.
Fixes #82409