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: Rename internal uses of spotlight #83756

Merged
merged 2 commits into from
Apr 4, 2021

Conversation

camelid
Copy link
Member

@camelid camelid commented Apr 1, 2021

I didn't make these renames in #80965 because I didn't want the PR to
conflict with #80914.

@camelid camelid added C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Apr 1, 2021
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @GuillaumeGomez

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 1, 2021
@camelid camelid 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 1, 2021
@camelid
Copy link
Member Author

camelid commented Apr 1, 2021

There are conflicts, but I'll wait to fix them until after #80965 lands. I mainly opened this PR so I don't forget to do the renames :)

@camelid camelid force-pushed the internal-rename-doc-spotlight branch from c086e5c to 13e8573 Compare April 2, 2021 17:54
@camelid camelid marked this pull request as ready for review April 2, 2021 17:54
@camelid camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 2, 2021
@camelid
Copy link
Member Author

camelid commented Apr 2, 2021

Rebased because #80965 has now merged. Ready for review!

@@ -173,13 +173,10 @@ code, pre, a.test-arrow {
border-radius: 3px;
padding: 0 0.1em;
}
.docblock pre code, .docblock-short pre code, .docblock code.spotlight {
.docblock pre code, .docblock-short pre code {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be:

Suggested change
.docblock pre code, .docblock-short pre code {
.docblock pre code, .docblock-short pre code, .docblock code.notable {

?

Copy link
Member Author

@camelid camelid Apr 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the commit message in 1fe0fe4. The classes appear to be unused.

padding: 0;
padding-right: 1ex;
}
.docblock code.spotlight :last-child {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rust-log-analyzer

This comment has been minimized.

I didn't make these renames in rust-lang#80965 because I didn't want the PR to
conflict with rust-lang#80914.
I couldn't find any uses of this CSS. I think it was superseded by the
`.notable-traits` CSS class and other similarly-named CSS classes.
@camelid camelid force-pushed the internal-rename-doc-spotlight branch from 13e8573 to 1fe0fe4 Compare April 2, 2021 18:38
@GuillaumeGomez
Copy link
Member

You're right: both CSS classes are now unused. Then it's all good for me, thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Apr 3, 2021

📌 Commit 1fe0fe4 has been approved by GuillaumeGomez

@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 Apr 3, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 3, 2021
Rollup of 7 pull requests

Successful merges:

 - rust-lang#82487 (Constify methods of `std::net::SocketAddr`, `SocketAddrV4` and `SocketAddrV6`)
 - rust-lang#83756 (rustdoc: Rename internal uses of `spotlight`)
 - rust-lang#83780 (Document "standard" conventions for error messages)
 - rust-lang#83787 (Monomorphization doc fix)
 - rust-lang#83803 (add fp-armv8 for ARM_ALLOWED_FEATURES)
 - rust-lang#83804 (Remove nightly features in rustc_type_ir)
 - rust-lang#83810 (Fix rustc_lint_defs documentation typo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0daec04 into rust-lang:master Apr 4, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 4, 2021
@camelid camelid deleted the internal-rename-doc-spotlight branch April 4, 2021 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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.

6 participants