Omit target-redirect from permalink

Author: jsha

src/web/rustdoc.rs

@@ -476,8 +476,8 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
     };
 
     let permalink_path = format!(
-        "/crate/{}/{}{}{}",
-        name, latest_version, target_redirect, query_string
+        "/{}/{}/{}{}",
+        name, latest_version, inner_path, query_string
     );
 
     let latest_path = format!("/crate/{}/latest{}{}", name, target_redirect, query_string);
@@ -834,7 +834,7 @@ mod test {
             let body = String::from_utf8(resp.bytes().unwrap().to_vec()).unwrap();
             assert!(body.contains("<a href=\"/crate/dummy/latest/source/\""));
             assert!(body.contains("<a href=\"/crate/dummy/latest\""));
-            assert!(body.contains("<a href=\"/crate/dummy/0.1.0/target-redirect/x86_64-unknown-linux-gnu/dummy/index.html\""));
+            assert!(body.contains("<a href=\"/dummy/0.1.0/dummy/index.html\""));
             Ok(())
         })
     }

static/menu.js

@@ -241,11 +241,7 @@
             if (document.location.hash != "") {
               permalink.href += "#" + document.location.hash;
             }
-            // Note: It would be nicer to do history.replaceState here and avoid a page load
-            // (that's what GitHub does), but the permalink goes through a redirect, so you wind up
-            // with a weird URL like:
-            // http://localhost:3000/crate/regex/1.3.1/target-redirect/x86_64-unknown-linux-gnu/regex/index.html
-            permalink.click();
+            history.replaceState({}, null, permalink.href);
         }
     });
 })();