diff --git a/src/doc/rustdoc/src/unstable-features.md b/src/doc/rustdoc/src/unstable-features.md
index 16356c20c7069..44b9145a8c2e5 100644
--- a/src/doc/rustdoc/src/unstable-features.md
+++ b/src/doc/rustdoc/src/unstable-features.md
@@ -305,7 +305,7 @@ $ rustdoc src/lib.rs -Z unstable-options --themes theme.css
Giving this flag to `rustdoc` will make it copy your theme into the generated crate docs and enable
it in the theme selector. Note that `rustdoc` will reject your theme file if it doesn't style
-everything the "main" theme does. See `--theme-checker` below for details.
+everything the "light" theme does. See `--theme-checker` below for details.
### `--theme-checker`: verify theme CSS for validity
@@ -316,7 +316,7 @@ $ rustdoc -Z unstable-options --theme-checker theme.css
```
Before including your theme in crate docs, `rustdoc` will compare all the CSS rules it contains
-against the "main" theme included by default. Using this flag will allow you to see which rules are
+against the "light" theme included by default. Using this flag will allow you to see which rules are
missing if `rustdoc` rejects your theme.
### `--resource-suffix`: modifying the name of CSS/JavaScript in crate docs
@@ -330,7 +330,7 @@ $ rustdoc src/lib.rs -Z unstable-options --resource-suffix suf
When rendering docs, `rustdoc` creates several CSS and JavaScript files as part of the output. Since
all these files are linked from every page, changing where they are can be cumbersome if you need to
specially cache them. This flag will rename all these files in the output to include the suffix in
-the filename. For example, `main.css` would become `main-suf.css` with the above command.
+the filename. For example, `light.css` would become `light-suf.css` with the above command.
### `--display-warnings`: display warnings when documenting or running documentation tests
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index 0151a8c3ab715..aac5d0d2601de 100644
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -53,7 +53,7 @@ r##"
id="mainThemeStyle">
{themes}
-
+
{css_extension}
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 678e1762a5519..6d71b0ec8ec7e 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -129,8 +129,8 @@ pub struct SharedContext {
pub sort_modules_alphabetically: bool,
/// Additional themes to be added to the generated docs.
pub themes: Vec,
- /// Suffix to be added on resource files (if suffix is "-v2" then "main.css" becomes
- /// "main-v2.css").
+ /// Suffix to be added on resource files (if suffix is "-v2" then "light.css" becomes
+ /// "light-v2.css").
pub resource_suffix: String,
}
@@ -743,7 +743,7 @@ fn write_shared(cx: &Context,
write(cx.dst.join(&format!("rustdoc{}.css", cx.shared.resource_suffix)),
include_bytes!("static/rustdoc.css"))?;
- // To avoid "main.css" to be overwritten, we'll first run over the received themes and only
+ // To avoid "light.css" to be overwritten, we'll first run over the received themes and only
// then we'll run over the "official" styles.
let mut themes: HashSet = HashSet::new();
@@ -761,9 +761,9 @@ fn write_shared(cx: &Context,
write(cx.dst.join(&format!("brush{}.svg", cx.shared.resource_suffix)),
include_bytes!("static/brush.svg"))?;
- write(cx.dst.join(&format!("main{}.css", cx.shared.resource_suffix)),
- include_bytes!("static/themes/main.css"))?;
- themes.insert("main".to_owned());
+ write(cx.dst.join(&format!("light{}.css", cx.shared.resource_suffix)),
+ include_bytes!("static/themes/light.css"))?;
+ themes.insert("light".to_owned());
write(cx.dst.join(&format!("dark{}.css", cx.shared.resource_suffix)),
include_bytes!("static/themes/dark.css"))?;
themes.insert("dark".to_owned());
diff --git a/src/librustdoc/html/static/storage.js b/src/librustdoc/html/static/storage.js
index c8571e4cf9181..2f4e203ebc5c2 100644
--- a/src/librustdoc/html/static/storage.js
+++ b/src/librustdoc/html/static/storage.js
@@ -67,4 +67,4 @@ function switchTheme(styleElem, mainStyleElem, newTheme) {
}
}
-switchTheme(currentTheme, mainTheme, getCurrentValue('rustdoc-theme') || 'main');
+switchTheme(currentTheme, mainTheme, getCurrentValue('rustdoc-theme') || 'light');
diff --git a/src/librustdoc/html/static/themes/main.css b/src/librustdoc/html/static/themes/light.css
similarity index 100%
rename from src/librustdoc/html/static/themes/main.css
rename to src/librustdoc/html/static/themes/light.css
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index bec25a98227a2..9f6e0c2944e3a 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -266,8 +266,8 @@ pub fn opts() -> Vec {
unstable("resource-suffix", |o| {
o.optopt("",
"resource-suffix",
- "suffix to add to CSS and JavaScript files, e.g. \"main.css\" will become \
- \"main-suffix.css\"",
+ "suffix to add to CSS and JavaScript files, e.g. \"light.css\" will become \
+ \"light-suffix.css\"",
"PATH")
}),
]
@@ -321,7 +321,7 @@ pub fn main_args(args: &[String]) -> isize {
let to_check = matches.opt_strs("theme-checker");
if !to_check.is_empty() {
- let paths = theme::load_css_paths(include_bytes!("html/static/themes/main.css"));
+ let paths = theme::load_css_paths(include_bytes!("html/static/themes/light.css"));
let mut errors = 0;
println!("rustdoc: [theme-checker] Starting tests!");
@@ -392,7 +392,7 @@ pub fn main_args(args: &[String]) -> isize {
let mut themes = Vec::new();
if matches.opt_present("themes") {
- let paths = theme::load_css_paths(include_bytes!("html/static/themes/main.css"));
+ let paths = theme::load_css_paths(include_bytes!("html/static/themes/light.css"));
for (theme_file, theme_s) in matches.opt_strs("themes")
.iter()
diff --git a/src/tools/error_index_generator/main.rs b/src/tools/error_index_generator/main.rs
index cdeb601567256..ade7ae0a4aee7 100644
--- a/src/tools/error_index_generator/main.rs
+++ b/src/tools/error_index_generator/main.rs
@@ -61,8 +61,8 @@ impl Formatter for HTMLFormatter {
Rust Compiler Error Index
-
-
+
+