Fix error index CSS file name

rust-lang · Mar 26, 2019 · 5652dd6 · 5652dd6
1 parent 50c50e3
commit 5652dd6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
@@ -889,6 +889,7 @@ impl Step for ErrorIndex {
         );
         index.arg("html");
         index.arg(out.join("error-index.html"));
+        index.arg(crate::channel::CFG_RELEASE_NUM);
 
         // FIXME: shouldn't have to pass this env var
         index.env("CFG_BUILD", &builder.config.build)

diff --git a/src/tools/error_index_generator/main.rs b/src/tools/error_index_generator/main.rs
@@ -27,9 +27,10 @@ enum OutputFormat {
 }
 
 impl OutputFormat {
-    fn from(format: &str) -> OutputFormat {
+    fn from(format: &str, resource_suffix: &str) -> OutputFormat {
         match &*format.to_lowercase() {
-            "html"     => OutputFormat::HTML(HTMLFormatter(RefCell::new(IdMap::new()))),
+            "html"     => OutputFormat::HTML(HTMLFormatter(RefCell::new(IdMap::new()),
+                                                           resource_suffix.to_owned())),
             "markdown" => OutputFormat::Markdown(MarkdownFormatter),
             s          => OutputFormat::Unknown(s.to_owned()),
         }
@@ -44,7 +45,7 @@ trait Formatter {
     fn footer(&self, output: &mut dyn Write) -> Result<(), Box<dyn Error>>;
 }
 
-struct HTMLFormatter(RefCell<IdMap>);
+struct HTMLFormatter(RefCell<IdMap>, String);
 struct MarkdownFormatter;
 
 impl Formatter for HTMLFormatter {
@@ -55,7 +56,7 @@ impl Formatter for HTMLFormatter {
 <title>Rust Compiler Error Index</title>
 <meta charset="utf-8">
 <!-- Include rust.css after light.css so its rules take priority. -->
-<link rel="stylesheet" type="text/css" href="light.css"/>
+<link rel="stylesheet" type="text/css" href="light{suffix}.css"/>
 <link rel="stylesheet" type="text/css" href="rust.css"/>
 <style>
 .error-undescribed {{
@@ -64,7 +65,7 @@ impl Formatter for HTMLFormatter {
 </style>
 </head>
 <body>
-"##)?;
+"##, suffix=self.1)?;
         Ok(())
     }
 
@@ -242,9 +243,12 @@ fn main_with_result(format: OutputFormat, dst: &Path) -> Result<(), Box<dyn Erro
 
 fn parse_args() -> (OutputFormat, PathBuf) {
     let mut args = env::args().skip(1);
-    let format = args.next().map(|a| OutputFormat::from(&a))
-                            .unwrap_or(OutputFormat::from("html"));
-    let dst = args.next().map(PathBuf::from).unwrap_or_else(|| {
+    let format = args.next();
+    let dst = args.next();
+    let resource_suffix = args.next().unwrap_or_else(String::new);
+    let format = format.map(|a| OutputFormat::from(&a, &resource_suffix))
+                       .unwrap_or(OutputFormat::from("html", &resource_suffix));
+    let dst = dst.map(PathBuf::from).unwrap_or_else(|| {
         match format {
             OutputFormat::HTML(..) => PathBuf::from("doc/error-index.html"),
             OutputFormat::Markdown(..) => PathBuf::from("doc/error-index.md"),