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

Put backtick content from rustdoc search errors into a <code> elements #108584

Merged
merged 3 commits into from
Mar 3, 2023

Conversation

GuillaumeGomez
Copy link
Member

Some screenshots of the result:

Screenshot from 2023-02-28 22-37-09
Screenshot from 2023-02-28 22-36-59
Screenshot from 2023-02-28 22-36-51

You can test it here.

r? @notriddle

@GuillaumeGomez GuillaumeGomez marked this pull request as ready for review February 28, 2023 21:56
@rustbot
Copy link
Collaborator

rustbot commented Feb 28, 2023

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @Folyd, @jsha

A change occurred in the Ayu theme.

cc @Cldfire

@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 28, 2023
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-search-background branch 2 times, most recently from c19c928 to 8b82a46 Compare March 1, 2023 16:23
@GuillaumeGomez
Copy link
Member Author

So I went with a different strategy which works far better but is making source code a bit worse.

@bors
Copy link
Contributor

bors commented Mar 1, 2023

☔ The latest upstream changes (presumably #108620) made this pull request unmergeable. Please resolve the merge conflicts.

@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-search-background branch from 8b82a46 to 51493f3 Compare March 2, 2023 09:54
@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-search-background branch from 51493f3 to cfb4af8 Compare March 2, 2023 11:59
@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 2, 2023

📌 Commit cfb4af8 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 Mar 2, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Mar 2, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 2, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#108022 (Support allocations with non-Box<[u8]> bytes)
 - rust-lang#108367 (Re-apply "switch to the macos-12-xl builder")
 - rust-lang#108557 (Point error span at Some constructor argument when trait resolution fails)
 - rust-lang#108573 (Explain compile-time vs run-time difference in env!() error message)
 - rust-lang#108584 (Put backtick content from rustdoc search errors into a `<code>` elements)
 - rust-lang#108624 (Make `ExprKind` the first field in `thir::Expr`)
 - rust-lang#108644 (Allow setting hashmap toml values in `./configure`)
 - rust-lang#108672 (Feed queries on impl side for RPITITs when using lower_impl_trait_in_trait_to_assoc_ty)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0dc12b9 into rust-lang:master Mar 3, 2023
@rustbot rustbot added this to the 1.69.0 milestone Mar 3, 2023
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-search-background branch March 3, 2023 18:50
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