Rollup of 6 pull requests #47485
Closed
Rollup of 6 pull requests #47485
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
Member
GuillaumeGomez
commented
Jan 16, 2018
GuillaumeGomez
commented
- Successful merges: Test rustdoc js #47250, fix faulty comment #47302, Report errors instead of panic!() when linkcheck encounters absolute paths #47387, Switch to pulldown as default markdown renderer #47398, Update html-diff crate => fix unicode parsing and invalid paths #47436, Don't include bang in macro replacement suggestion #47444
- Failed merges:
When we suggest the replacement for a macro we include the "!" in the suggested replacement but the span only contains the name of the macro itself. Using that replacement would cause a duplicate "!" in the resulting code. I originally tried to extend the span to be replaced by 1 byte in rust-lang#47424. However, @zackmdavis pointed out that there can be whitespace between the macro name and the bang. Instead, just remove the bang from the suggested replacement. Fixes rust-lang#47418
…ark-Simulacrum Test rustdoc js Add tests for the rustdoc search. It was heavily required because of all the recent breaking changes that happened while I went through improvements in doc search (add search in/for generic search for example).
…ster fix faulty comment after rust-lang#43506 there is no fixed number of request sent.
…teveklabnik Report errors instead of panic!() when linkcheck encounters absolute paths The RBE contained some absolute links that failed the link check in rust-lang#46196. Diagnosing these issues was needlessly complicated, thanks to the linkchecker just panicing instead of reporting proper errors. This PR replaces the panic with a proper `*errors = true` + error message handling. The linkchecker itself doesn't have any tests so I intentionally didn't touch anything else than the code that previously did the `panic!()`. A small code quality improvement might be made by binding the `Path::new(base).join(url)` into a variable before the for-loop and using this resolved url in both the for loop and the error message. r? @steveklabnik (If not for any other reason than having r on the rust-lang#46196.)
…=QuietMisdreavus Switch to pulldown as default markdown renderer r? @QuietMisdreavus
…tMisdreavus Update html-diff crate => fix unicode parsing and invalid paths r? @QuietMisdreavus
…suggestion, r=estebank Don't include bang in macro replacement suggestion When we suggest the replacement for a macro we include the "!" in the suggested replacement but the span only contains the name of the macro itself. Using that replacement would cause a duplicate "!" in the resulting code. I originally tried to extend the span to be replaced by 1 byte in rust-lang#47424. However, @zackmdavis pointed out that there can be whitespace between the macro name and the bang. Instead, just remove the bang from the suggested replacement. Fixes rust-lang#47418 r? @estebank
|
Some changes occurred in HTML/CSS. |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit c91a3c2 has been approved by |
kennytm
added
the
S-waiting-on-bors
|
⌛ Testing commit c91a3c2 with merge db1abf855127da96e6ca564038b63b5a9d62ac82... |
|
💔 Test failed - status-appveyor |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.