Skip to content

rustdoc: refactor: move all static-file include!s into a single module - #55856

Merged
bors merged 1 commit into
rust-lang:masterfrom
QuietMisdreavus:static-discharge
Nov 11, 2018
Merged

rustdoc: refactor: move all static-file include!s into a single module#55856
bors merged 1 commit into
rust-lang:masterfrom
QuietMisdreavus:static-discharge

Conversation

@QuietMisdreavus

Copy link
Copy Markdown
Contributor

This is a smaller refactor that creates a new module rustdoc::html::static_files, which contains a bunch of static variables with all the files in html/static that we use. The idea behind moving them all here was to remove the duplicate include_bytes!() that are used by the theme-checker code. It also continues to centralize more operations in rustdoc.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @steveklabnik

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 10, 2018
@QuietMisdreavus

Copy link
Copy Markdown
ContributorAuthor

r? @GuillaumeGomez

@GuillaumeGomez

Copy link
Copy Markdown
Member

Nice, I really like how you did it! Thanks!

@bors: r+ rollup

@bors

bors commented Nov 10, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 2f8ce73 has been approved by GuillaumeGomez

@borsbors 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 Nov 10, 2018
kennytm added a commit to emilyalbini/rust that referenced this pull request Nov 11, 2018
…=GuillaumeGomez
rustdoc: refactor: move all static-file include!s into a single module
This is a smaller refactor that creates a new module `rustdoc::html::static_files`, which contains a bunch of `static` variables with all the files in `html/static` that we use. The idea behind moving them all here was to remove the duplicate `include_bytes!()` that are used by the theme-checker code. It also continues to centralize more operations in rustdoc.
bors added a commit that referenced this pull request Nov 11, 2018
Rollup of 17 pull requests
Successful merges:
- #55630 (resolve: Filter away macro prelude in modules with `#[no_implicit_prelude]` on 2018 edition)
- #55687 (Take supertraits into account when calculating associated types)
- #55745 (Convert `outlives_components`' return value to a `SmallVec` outparam.)
- #55764 (Fix Rc/Arc allocation layout)
- #55792 (Prevent ICE in const-prop array oob check)
- #55799 (Removed unneeded instance of `// revisions` from a lint test)
- #55800 (Fix ICE in `return_type_impl_trait`)
- #55801 (NLL: Update box insensitivity test)
- #55802 (Don't inline virtual calls (take 2))
- #55816 (Use `SmallVec` to avoid allocations in `from_decimal_string`.)
- #55819 (Typecheck patterns of all match arms first, so we get types for bindings)
- #55822 (ICE with #![feature(nll)] and elided lifetimes)
- #55828 (Add missing `rustc_promotable` attribute to unsigned `min_value` and `max_value`)
- #55839 (Fix docstring spelling mistakes)
- #55844 (Fix documentation typos.)
- #55845 (Set BINARYEN_TRAP_MODE=clamp)
- #55856 (rustdoc: refactor: move all static-file include!s into a single module)
@bors
bors merged commit 2f8ce73 into rust-lang:masterNov 11, 2018
@QuietMisdreavus
QuietMisdreavus deleted the static-discharge branch November 12, 2018 16:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@QuietMisdreavus@rust-highfive@GuillaumeGomez@bors@steveklabnik