Uh oh!
There was an error while loading. Please reload this page.
rustdoc: glue tokens before highlighting - #73807
Conversation
rust-highfive
commented
Jun 27, 2020
r? @ollie27 (rust_highfive has picked a reviewer for you, use r? to override) |
b2edece to
a78beaaComparebors
commented
Jul 14, 2020
☔ The latest upstream changes (presumably #74330) made this pull request unmergeable. Please resolve the merge conflicts. |
Fixesrust-lang#72684. This commit also modifies the signature of `Classifier::new` to avoid copying the source being highlighted.
a78beaa to
c3ee75dCompareollie27
commented
Jul 15, 2020
Sorry for the delay. Unfortunately this doesn't completely fix the issue. There are cases where tokens shouldn't be glued together for example: Before this PR:
After this PR:
I'm tempted to say we should merge this anyway unless there's an easy way to fix the above because in most cases this is an improvement. @GuillaumeGomez what do you think? |
euclio
commented
Jul 15, 2020
Yes, not ideal, but I believe that was the status-quo before |
GuillaumeGomez
commented
Jul 15, 2020
Not great if it introduces some regressions but it is an improvement, indeed. Can you open an issue about it, explaining a bit the situation and everything please? Once done, r=ollie27 and me |
@GuillaumeGomez To clarify, this PR doesn't introduce any regressions. 1.38.0 (the last release where
Writing a triple reference is rare enough that I think this is acceptable. |
GuillaumeGomez
commented
Jul 15, 2020
Oh I see, I thought you were talking about the documentation, not the source code pages. Then it's all improvements! :D |
ollie27
commented
Jul 16, 2020
I didn't realize that that bug was present in the past, in which case I agree that this is fine. @bors r=ollie27,GuillaumeGomez |
bors
commented
Jul 16, 2020
📌 Commit c3ee75d has been approved by |
…e27,GuillaumeGomez rustdoc: glue tokens before highlighting Fixesrust-lang#72684. This commit also modifies the signature of `Classifier::new` to avoid copying the source being highlighted.
…e27,GuillaumeGomez rustdoc: glue tokens before highlighting Fixesrust-lang#72684. This commit also modifies the signature of `Classifier::new` to avoid copying the source being highlighted.
…e27,GuillaumeGomez rustdoc: glue tokens before highlighting Fixesrust-lang#72684. This commit also modifies the signature of `Classifier::new` to avoid copying the source being highlighted.
…arth Rollup of 21 pull requests Successful merges: - rust-lang#73566 (Don't run `everybody_loops` for rustdoc; instead ignore resolution errors) - rust-lang#73771 (Don't pollute docs/suggestions with libstd deps) - rust-lang#73794 (Small cleanup for E0705 explanation) - rust-lang#73807 (rustdoc: glue tokens before highlighting) - rust-lang#73835 (Clean up E0710 explanation) - rust-lang#73926 (Ignoring test case: [codegen] repr-transparent-aggregates-1.rs for aarch64) - rust-lang#73981 (Remove some `ignore-stage1` annotations.) - rust-lang#73998 (add regression test for rust-lang#61216) - rust-lang#74140 (Make hir ProjectionKind more precise) - rust-lang#74148 (Move #[doc(alias)] check in rustc) - rust-lang#74159 (forbid generic params in the type of const params) - rust-lang#74171 (Fix 44056 test with debug on macos.) - rust-lang#74221 (Don't panic if the lhs of a div by zero is not statically known) - rust-lang#74325 (Focus on the current file in the source file sidebar) - rust-lang#74359 (rustdoc: Rename internal API fns to `into_string`) - rust-lang#74370 (Reintroduce spotlight / "important traits" feature) - rust-lang#74390 (Fix typo in std::mem::transmute documentation) - rust-lang#74391 (BtreeMap: superficially refactor root access) - rust-lang#74392 (const generics triage) - rust-lang#74397 (Fix typo in the latest release note) - rust-lang#74406 (Set shell for github actions CI) Failed merges: r? @ghost
Fixes#72684.
This commit also modifies the signature of
Classifier::newto avoidcopying the source being highlighted.