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: use src consistently over source in CSS/JS #113709

Merged
merged 3 commits into from
Jul 15, 2023

Conversation

notriddle
Copy link
Contributor

@notriddle notriddle commented Jul 14, 2023

The two terms have been used, inconsistently, in closely related spots like the src/ directory vs source-files.js, and with things like src-sidebar-toggle vs the source-sidebar. This PR changes most use of source to src instead (except the localStorage configuration variables, which would be very complicated to migrate).

It also renames .srclink to .src. This is mostly aiming to cut out one of those many little peanut-butter bits of bloat, and is consistent with how other link classes are done (like how you have a.mod stylesheet rules, but there's also a mod class put on the body tag).

The CSS uses an inconsistent mix of both. This commit switches
it to always use `src`.
Since the directory that contains source files is called `src`,
it makes sense to name the scripts that way, too.
This is a separate commit to keep Git happy.
@rustbot
Copy link
Collaborator

rustbot commented Jul 14, 2023

r? @jsha

(rustbot has picked a reviewer for you, use r? to override)

@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 Jul 14, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 14, 2023

Some changes occurred in GUI tests.

cc @GuillaumeGomez

A change occurred in the Ayu theme.

cc @Cldfire

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @Folyd, @jsha

Some changes occurred in HTML/CSS themes.

cc @GuillaumeGomez

@GuillaumeGomez
Copy link
Member

Unification of terms doesn't hurt indeed. Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 15, 2023

📌 Commit d7d0a45 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 15, 2023

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Jul 15, 2023
@notriddle notriddle assigned GuillaumeGomez and unassigned jsha Jul 15, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 15, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#113625 (Structurally normalize in selection)
 - rust-lang#113644 (misc bootstrap cleanups)
 - rust-lang#113663 (Implement "items do not inherit unsafety" note for THIR unsafeck)
 - rust-lang#113683 (remove outdated `FIXME`s in bootstrap internals)
 - rust-lang#113709 (rustdoc: use src consistently over source in CSS/JS)
 - rust-lang#113724 (Migrate GUI colors test to original CSS color format)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 331b5ba into rust-lang:master Jul 15, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 15, 2023
@notriddle notriddle deleted the notriddle/src branch July 15, 2023 20:47
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