Redirect

nrc · nrc · commit 301401e568e6 · 2016-08-19T08:20:06.000+12:00
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
@@ -1426,6 +1426,16 @@ impl Context {
                                                                 .open(&redir_dst) {
                     try_err!(layout::redirect(&mut redirect_out, file_name), &redir_dst);
                 }
+
+                // If the item is a macro, redirect from the old macro URL (with !)
+                // to the new one (without).
+                // FIXME(#35705) remove this redirect.
+                if item_type == ItemType::Macro {
+                    let redir_name = format!("{}.{}!.html", item_type, name);
+                    let redir_dst = self.dst.join(redir_name);
+                    let mut redirect_out = try_err!(File::create(&redir_dst), &redir_dst);
+                    try_err!(layout::redirect(&mut redirect_out, file_name), &redir_dst);
+                }
             }
         }
         Ok(())
diff --git a/src/test/rustdoc/macros.rs b/src/test/rustdoc/macros.rs
@@ -12,6 +12,8 @@
 // @has - //pre '() => { ... };'
 // @has - //pre '($a:tt) => { ... };'
 // @has - //pre '($e:expr) => { ... };'
+// @has macros/macro.my_macro!.html
+// @has - //a 'macro.my_macro.html'
 #[macro_export]
 macro_rules! my_macro {
     () => [];

Original file line number	Diff line number	Diff line change
`@@ -1426,6 +1426,16 @@ impl Context {`
`1426`	`1426`	`.open(&redir_dst) {`
`1427`	`1427`	`try_err!(layout::redirect(&mut redirect_out, file_name), &redir_dst);`
`1428`	`1428`	`}`
	`1429`	`+`
	`1430`	`+ // If the item is a macro, redirect from the old macro URL (with !)`
	`1431`	`+ // to the new one (without).`
	`1432`	`+ // FIXME(#35705) remove this redirect.`
	`1433`	`+ if item_type == ItemType::Macro {`
	`1434`	`+ let redir_name = format!("{}.{}!.html", item_type, name);`
	`1435`	`+ let redir_dst = self.dst.join(redir_name);`
	`1436`	`+ let mut redirect_out = try_err!(File::create(&redir_dst), &redir_dst);`
	`1437`	`+ try_err!(layout::redirect(&mut redirect_out, file_name), &redir_dst);`
	`1438`	`+ }`
`1429`	`1439`	`}`
`1430`	`1440`	`}`
`1431`	`1441`	`Ok(())`