]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8ad36c4)
Handle error code hash by redirecting to the correct error code page
authorGuillaume Gomez <guillaume.gomez@huawei.com>
Tue, 23 Aug 2022 19:44:25 +0000 (21:44 +0200)
committerGuillaume Gomez <guillaume.gomez@huawei.com>
Tue, 23 Aug 2022 19:44:29 +0000 (21:44 +0200)
src/tools/error_index_generator/main.rs patch | blob | history

diff --git a/src/tools/error_index_generator/main.rs b/src/tools/error_index_generator/main.rs
index 22243f9fc9d6ca9b26fd0067c12df0ac59d34672..68c46700361a8da36dd766f53a69e5720760b6b9 100644 (file)
--- a/src/tools/error_index_generator/main.rs
+++ b/src/tools/error_index_generator/main.rs
@@ -59,7 +59,7 @@ fn create_error_code_file(
     ) -> Result<(), Box<dyn Error>> {
         let mut output_file = File::create(parent_dir.join(err_code).with_extension("html"))?;
 
-        self.header(&mut output_file, "../")?;
+        self.header(&mut output_file, "../", "")?;
         self.title(&mut output_file, &format!("Error code {}", err_code))?;
 
         let mut id_map = IdMap::new();
@@ -90,7 +90,12 @@ fn create_error_code_file(
         self.footer(&mut output_file)
     }
 
-    fn header(&self, output: &mut dyn Write, extra: &str) -> Result<(), Box<dyn Error>> {
+    fn header(
+        &self,
+        output: &mut dyn Write,
+        extra_path: &str,
+        extra: &str,
+    ) -> Result<(), Box<dyn Error>> {
         write!(
             output,
             r##"<!DOCTYPE html>
@@ -99,14 +104,14 @@ fn header(&self, output: &mut dyn Write, extra: &str) -> Result<(), Box<dyn Erro
 <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="{extra}rustdoc{suffix}.css"/>
-<link rel="stylesheet" type="text/css" href="{extra}light{suffix}.css"/>
-<link rel="stylesheet" type="text/css" href="{extra}rust.css"/>
+<link rel="stylesheet" type="text/css" href="{extra_path}rustdoc{suffix}.css"/>
+<link rel="stylesheet" type="text/css" href="{extra_path}light{suffix}.css"/>
+<link rel="stylesheet" type="text/css" href="{extra_path}rust.css"/>
 <style>
 .error-undescribed {{
     display: none;
 }}
-</style>
+</style>{extra}
 </head>
 <body>
 "##,
@@ -153,7 +158,22 @@ fn render_html(output_path: &Path, formatter: HTMLFormatter) -> Result<(), Box<d
         create_dir_all(&parent)?;
     }
 
-    formatter.header(&mut output_file, "")?;
+    formatter.header(
+        &mut output_file,
+        "",
+        &format!(
+            r#"<script>(function() {{
+    if (window.location.hash) {{
+        let code = window.location.hash.replace(/^#/, '');
+        // We have to make sure this pattern matches to avoid inadvertently creating an
+        // open redirect.
+        if (/^E[0-9]+$/.test(code)) {{
+            window.location = './{error_codes_dir}/' + code + '.html';
+        }}
+    }}
+}})()</script>"#
+        ),
+    )?;
     formatter.title(&mut output_file, "Rust Compiler Error Index")?;
 
     write!(
Empowering everyone to build reliable and efficient software.