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.

Sign up for GitHub

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

Jump to bottom

Clean up rustdoc static files #86933

Merged
merged 1 commit into from
Jul 8, 2021
Merged

Clean up rustdoc static files #86933

merged 1 commit into from
Jul 8, 2021

Conversation

GuillaumeGomez
Copy link
Member

The html/static of rustdoc was starting to be quite a mess... So I moved files in sub-folders to make it easier to follow. Here what remains in html/static folder:

$ ls
COPYRIGHT.txt  css  fonts  images  js  LICENSE-APACHE.txt  LICENSE-MIT.txt

cc @jyn514
r? @Manishearth

@GuillaumeGomez GuillaumeGomez added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jul 7, 2021
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 7, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez force-pushed the cleanup-rustdoc-static-files branch from 7b0d595 to df852c6 Compare July 7, 2021 12:57
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez force-pushed the cleanup-rustdoc-static-files branch from df852c6 to df14a42 Compare July 7, 2021 14:15
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez force-pushed the cleanup-rustdoc-static-files branch from df14a42 to 2615690 Compare July 7, 2021 14:32
Manishearth
Manishearth approved these changes Jul 7, 2021
View reviewed changes
Copy link
Member

@Manishearth Manishearth left a comment

Choose a reason for hiding this comment

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

It would be nice to clean up the generated code structure as well, but that doesn't have to be now.

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 7, 2021

📌 Commit 2615690792bc6fa1b8eb3d5aeae30bc5cb873928 has been approved by Manishearth

@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 7, 2021
@GuillaumeGomez
Copy link
Member Author

It's kinda started with the templating (using tera). It's on pause until @jsha comes back. :)

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Jul 7, 2021 •
edited
Loading

Seems like I forgot to update the paths in the tests...

EDIT: Actually only one test...

@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 Jul 7, 2021
@GuillaumeGomez GuillaumeGomez force-pushed the cleanup-rustdoc-static-files branch from 2615690 to 815eefe Compare July 7, 2021 15:06
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez force-pushed the cleanup-rustdoc-static-files branch from 815eefe to e5c24ba Compare July 7, 2021 15:52
Manishearth
Manishearth approved these changes Jul 7, 2021
View reviewed changes
Copy link
Member

@Manishearth Manishearth left a comment

Choose a reason for hiding this comment

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

feel free to r=manishearth when ready 😄

@GuillaumeGomez
Copy link
Member Author

Normally this time it should be good. :)

@bors: r=Manishearth

@bors
Copy link
Contributor

bors commented Jul 7, 2021

📌 Commit e5c24ba has been approved by Manishearth

@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 Jul 7, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 7, 2021
@JohnTitor
Rollup merge of rust-lang#86933 - GuillaumeGomez:cleanup-rustdoc-stat…
885d00c 
…ic-files, r=Manishearth

Clean up rustdoc static files

The `html/static` of rustdoc was starting to be quite a mess... So I moved files in sub-folders to make it easier to follow. Here what remains in `html/static` folder:

```
$ ls
COPYRIGHT.txt  css  fonts  images  js  LICENSE-APACHE.txt  LICENSE-MIT.txt
```

cc `@jyn514`
r? `@Manishearth`
@JohnTitor JohnTitor mentioned this pull request Jul 7, 2021
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 7, 2021
@JohnTitor
Rollup merge of rust-lang#86933 - GuillaumeGomez:cleanup-rustdoc-stat…
ca92a72 
…ic-files, r=Manishearth

Clean up rustdoc static files

The `html/static` of rustdoc was starting to be quite a mess... So I moved files in sub-folders to make it easier to follow. Here what remains in `html/static` folder:

```
$ ls
COPYRIGHT.txt  css  fonts  images  js  LICENSE-APACHE.txt  LICENSE-MIT.txt
```

cc ``@jyn514``
r? ``@Manishearth``
@JohnTitor JohnTitor mentioned this pull request Jul 7, 2021
Closed
@JohnTitor JohnTitor mentioned this pull request Jul 8, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2021
@bors
Auto merge of rust-lang#86966 - JohnTitor:rollup-uiqj2vc, r=JohnTitor
ac8c3bf 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#86639 (Support lint tool names in rustc command line options)
 - rust-lang#86812 (Recover from `&dyn mut ...` parse errors)
 - rust-lang#86917 (Add doc comment for `impl From<LayoutError> for TryReserveError`)
 - rust-lang#86925 (Add self to mailmap)
 - rust-lang#86927 (Sync rustc_codegen_cranelift)
 - rust-lang#86932 (Fix ICE when misplaced visibility cannot be properly parsed)
 - rust-lang#86933 (Clean up rustdoc static files)
 - rust-lang#86955 (Fix typo in `ops::Drop` docs)
 - rust-lang#86956 (Revert "Add "every" as a doc alias for "all".")

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 59b4f88 into rust-lang:master Jul 8, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 8, 2021
@GuillaumeGomez GuillaumeGomez deleted the cleanup-rustdoc-static-files branch July 8, 2021 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Manishearth Manishearth Manishearth approved these changes

Assignees

@Manishearth Manishearth

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
Milestone
1.55.0
Development

Successfully merging this pull request may close these issues.
6 participants
@GuillaumeGomez @rust-highfive @rust-log-analyzer @Manishearth @bors @rustbot