diff options
| author | bors <bors@rust-lang.org> | 2020-12-27 09:55:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-12-27 09:55:51 +0000 |
| commit | dc6121ca681e3aef09b93afb13637632dcdc0e9a (patch) | |
| tree | 9467813295305ecfaedaca1643de0a2f9e102b2d | |
| parent | 1d517afcd0929450ded8f644fa8e8da3776db68b (diff) | |
| parent | 63f3876b856e8e995d2b4960ca9f6f617950ce7b (diff) | |
| download | rust-dc6121ca681e3aef09b93afb13637632dcdc0e9a.tar.gz rust-dc6121ca681e3aef09b93afb13637632dcdc0e9a.zip | |
Auto merge of #79642 - ijackson:default-theme-stab, r=jyn514
rustdoc: stabilise --default-theme command line option As discussed in #77213, this seems like it has bedded in and can be safely and usefully made stable. (rustdoc already has other stable options that interact quite intimately with the rustdoc-supplied CSS, and also an option for supplying entirely different CSS, so exposing the theme names this way seems a very minor step.) There is also a commit to do some minor grammar fixes to the help message.
| -rw-r--r-- | src/doc/rustdoc/src/command-line-arguments.md | 20 | ||||
| -rw-r--r-- | src/librustdoc/lib.rs | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/doc/rustdoc/src/command-line-arguments.md b/src/doc/rustdoc/src/command-line-arguments.md index 31e002810ce..80f7851debf 100644 --- a/src/doc/rustdoc/src/command-line-arguments.md +++ b/src/doc/rustdoc/src/command-line-arguments.md @@ -237,6 +237,26 @@ for a target triple that's different than your host triple. All of the usual caveats of cross-compiling code apply. +## `--default-theme`: set the default theme + +Using this flag looks like this: + +```bash +$ rustdoc src/lib.rs --default-theme=ayu +``` + +Sets the default theme (for users whose browser has not remembered a +previous theme selection from the on-page theme picker). + +The supplied value should be the lowercase version of the theme name. +The set of available themes can be seen in the theme picker in the +generated output. + +Note that the set of available themes - and their appearance - is not +necessarily stable from one rustdoc version to the next. If the +requested theme does not exist, the builtin default (currently +`light`) is used instead. + ## `--markdown-css`: include more CSS files when rendering markdown Using this flag looks like this: diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 72f1b817d5d..e8bf664d45c 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -263,13 +263,13 @@ fn opts() -> Vec<RustcOptGroup> { "sort modules by where they appear in the program, rather than alphabetically", ) }), - unstable("default-theme", |o| { + stable("default-theme", |o| { o.optopt( "", "default-theme", "Set the default theme. THEME should be the theme name, generally lowercase. \ If an unknown default theme is specified, the builtin default is used. \ - The set of themes, and the rustdoc built-in default is not stable.", + The set of themes, and the rustdoc built-in default, are not stable.", "THEME", ) }), |
