Skip to content
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

[rustdoc] Prevent inclusion of whitespace character after macro_rules ident #121689

Merged
merged 2 commits into from
Feb 29, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Feb 27, 2024

Discovered this bug randomly when looking at:

image

We were too eagerly trying to merge tokens that shouldn't be merged together (for example if you have a code comment followed by a code comment, we merge them in one attribute to reduce the DOM size).

r? @notriddle

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Feb 27, 2024
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 27, 2024

📌 Commit e9dbf44 has been approved by notriddle

It is now in the queue for this repository.

@bors 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 Feb 27, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 27, 2024
…g-whitespace, r=notriddle

[rustdoc] Prevent inclusion of whitespace character after macro_rules ident

Discovered this bug randomly when looking at:

![image](https://github.com/rust-lang/rust/assets/3050060/dca38047-9085-4377-bfac-f98890224be4)

We were too eagerly trying to merge tokens that shouldn't be merged together (for example if you have a code comment followed by a code comment, we merge them in one attribute to reduce the DOM size).

r? `@notriddle`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 27, 2024
…g-whitespace, r=notriddle

[rustdoc] Prevent inclusion of whitespace character after macro_rules ident

Discovered this bug randomly when looking at:

![image](https://github.com/rust-lang/rust/assets/3050060/dca38047-9085-4377-bfac-f98890224be4)

We were too eagerly trying to merge tokens that shouldn't be merged together (for example if you have a code comment followed by a code comment, we merge them in one attribute to reduce the DOM size).

r? ``@notriddle``
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 27, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#120051 (Add `display` method to `OsStr`)
 - rust-lang#121226 (Fix issues in suggesting importing extern crate paths)
 - rust-lang#121527 (unix_sigpipe: Simple fixes and improvements in tests)
 - rust-lang#121572 (Add test case for primitive links in alias js)
 - rust-lang#121661 (Changing some attributes to only_local.)
 - rust-lang#121680 (Fix link generation for foreign macro in jump to definition feature)
 - rust-lang#121686 (Adjust printing for RPITITs)
 - rust-lang#121689 ([rustdoc] Prevent inclusion of whitespace character after macro_rules ident)
 - rust-lang#121695 (Split rustc_type_ir to avoid rustc_ast from depending on it)
 - rust-lang#121698 (CFI: Fix typo in test file names)

Failed merges:

 - rust-lang#121423 (Remove the `UntranslatableDiagnosticTrivial` lint.)

r? `@ghost`
`@rustbot` modify labels: rollup
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 28, 2024
…g-whitespace, r=notriddle

[rustdoc] Prevent inclusion of whitespace character after macro_rules ident

Discovered this bug randomly when looking at:

![image](https://github.com/rust-lang/rust/assets/3050060/dca38047-9085-4377-bfac-f98890224be4)

We were too eagerly trying to merge tokens that shouldn't be merged together (for example if you have a code comment followed by a code comment, we merge them in one attribute to reduce the DOM size).

r? `@notriddle`
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 28, 2024
…llaumeGomez

Rollup of 13 pull requests

Successful merges:

 - rust-lang#120051 (Add `display` method to `OsStr`)
 - rust-lang#121226 (Fix issues in suggesting importing extern crate paths)
 - rust-lang#121423 (Remove the `UntranslatableDiagnosticTrivial` lint.)
 - rust-lang#121527 (unix_sigpipe: Simple fixes and improvements in tests)
 - rust-lang#121572 (Add test case for primitive links in alias js)
 - rust-lang#121661 (Changing some attributes to only_local.)
 - rust-lang#121680 (Fix link generation for foreign macro in jump to definition feature)
 - rust-lang#121686 (Adjust printing for RPITITs)
 - rust-lang#121689 ([rustdoc] Prevent inclusion of whitespace character after macro_rules ident)
 - rust-lang#121691 (handle unavailable creation time as `io::ErrorKind::Unsupported`)
 - rust-lang#121695 (Split rustc_type_ir to avoid rustc_ast from depending on it)
 - rust-lang#121698 (CFI: Fix typo in test file names)
 - rust-lang#121702 (Process alias-relate obligations in CoerceUnsized loop)

r? `@ghost`
`@rustbot` modify labels: rollup
@GuillaumeGomez
Copy link
Member Author

Failed in #121737. I forgot the channel thing once again...

@GuillaumeGomez
Copy link
Member Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 28, 2024
@GuillaumeGomez
Copy link
Member Author

Changed it into the "generic" form so let's go again.

@bors r=notriddle rollup

@bors
Copy link
Contributor

bors commented Feb 28, 2024

📌 Commit 632d26a has been approved by notriddle

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 28, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 28, 2024
…g-whitespace, r=notriddle

[rustdoc] Prevent inclusion of whitespace character after macro_rules ident

Discovered this bug randomly when looking at:

![image](https://github.com/rust-lang/rust/assets/3050060/dca38047-9085-4377-bfac-f98890224be4)

We were too eagerly trying to merge tokens that shouldn't be merged together (for example if you have a code comment followed by a code comment, we merge them in one attribute to reduce the DOM size).

r? `@notriddle`
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 29, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#110543 (Make `ReentrantLock` public)
 - rust-lang#121689 ([rustdoc] Prevent inclusion of whitespace character after macro_rules ident)
 - rust-lang#121724 (Use `LitKind::Err` for malformed floats)
 - rust-lang#121735 (pattern analysis: Don't panic when encountering unexpected constructor)
 - rust-lang#121743 (Opportunistically resolve regions when processing region outlives obligations)

Failed merges:

 - rust-lang#121326 (Detect empty leading where clauses on type aliases)
 - rust-lang#121416 (Improve error messages for generics with default parameters)
 - rust-lang#121669 (Count stashed errors again)
 - rust-lang#121723 (Two diagnostic things)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 843920f into rust-lang:master Feb 29, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 29, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 29, 2024
Rollup merge of rust-lang#121689 - GuillaumeGomez:rustdoc-highlighting-whitespace, r=notriddle

[rustdoc] Prevent inclusion of whitespace character after macro_rules ident

Discovered this bug randomly when looking at:

![image](https://github.com/rust-lang/rust/assets/3050060/dca38047-9085-4377-bfac-f98890224be4)

We were too eagerly trying to merge tokens that shouldn't be merged together (for example if you have a code comment followed by a code comment, we merge them in one attribute to reduce the DOM size).

r? ``@notriddle``
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-highlighting-whitespace branch February 29, 2024 09:39
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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants