Fix "latest" support for target redirect

Author: jsha

src/web/rustdoc.rs

@@ -556,13 +556,17 @@ pub fn target_redirect_handler(req: &mut Request) -> IronResult<Response> {
     let base = redirect_base(req);
     let updater = extension!(req, RepositoryStatsUpdater);
 
-    let version_or_latest = if req.url.path().get(1) == Some(&"latest") {
-        "latest"
-    } else {
-        version
+    let release_found = match_version(&mut conn, &name, Some(version))?;
+
+    let (version, version_or_latest) = match release_found.version {
+        MatchSemver::Exact((version, _)) => (version.clone(), version),
+        MatchSemver::Latest((version, _)) => (version, "latest".to_string()),
+        // semver matching not supported here
+        MatchSemver::Semver(_) => return Err(Nope::VersionNotFound.into()),
     };
+
     let crate_details =
-        match CrateDetails::new(&mut conn, name, version, version_or_latest, updater) {
+        match CrateDetails::new(&mut conn, name, &version, &version_or_latest, updater) {
             Some(krate) => krate,
             None => return Err(Nope::VersionNotFound.into()),
         };
@@ -589,7 +593,7 @@ pub fn target_redirect_handler(req: &mut Request) -> IronResult<Response> {
         req,
         storage.rustdoc_file_exists(
             name,
-            version,
+            &version,
             &file_path.join("/"),
             crate_details.archive_storage
         )
@@ -1327,6 +1331,27 @@ mod test {
                 )],
             )?;
 
+            assert_platform_links(
+                web,
+                "/dummy/latest/dummy/",
+                &[("x86_64-unknown-linux-gnu", "/dummy/latest/dummy/index.html")],
+            )?;
+
+            assert_platform_links(
+                web,
+                "/dummy/latest/dummy/index.html",
+                &[("x86_64-unknown-linux-gnu", "/dummy/latest/dummy/index.html")],
+            )?;
+
+            assert_platform_links(
+                web,
+                "/dummy/latest/dummy/struct.Dummy.html",
+                &[(
+                    "x86_64-unknown-linux-gnu",
+                    "/dummy/latest/dummy/struct.Dummy.html",
+                )],
+            )?;
+
             // set an explicit target that requires cross-compile
             env.fake_release()
                 .name("dummy")
@@ -1358,6 +1383,27 @@ mod test {
                 )],
             )?;
 
+            assert_platform_links(
+                web,
+                "/dummy/latest/dummy/",
+                &[("x86_64-pc-windows-msvc", "/dummy/latest/dummy/index.html")],
+            )?;
+
+            assert_platform_links(
+                web,
+                "/dummy/latest/dummy/index.html",
+                &[("x86_64-pc-windows-msvc", "/dummy/latest/dummy/index.html")],
+            )?;
+
+            assert_platform_links(
+                web,
+                "/dummy/latest/dummy/struct.Dummy.html",
+                &[(
+                    "x86_64-pc-windows-msvc",
+                    "/dummy/latest/dummy/struct.Dummy.html",
+                )],
+            )?;
+
             // set an explicit target without cross-compile
             env.fake_release()
                 .name("dummy")
@@ -1389,6 +1435,27 @@ mod test {
                 )],
             )?;
 
+            assert_platform_links(
+                web,
+                "/dummy/latest/dummy/",
+                &[("x86_64-unknown-linux-gnu", "/dummy/latest/dummy/index.html")],
+            )?;
+
+            assert_platform_links(
+                web,
+                "/dummy/latest/dummy/index.html",
+                &[("x86_64-unknown-linux-gnu", "/dummy/latest/dummy/index.html")],
+            )?;
+
+            assert_platform_links(
+                web,
+                "/dummy/latest/dummy/struct.Dummy.html",
+                &[(
+                    "x86_64-unknown-linux-gnu",
+                    "/dummy/latest/dummy/struct.Dummy.html",
+                )],
+            )?;
+
             // multiple targets
             env.fake_release()
                 .name("dummy")
@@ -1418,6 +1485,18 @@ mod test {
                 ],
             )?;
 
+            assert_platform_links(
+                web,
+                "/dummy/latest/settings.html",
+                &[
+                    (
+                        "x86_64-pc-windows-msvc",
+                        "/dummy/latest/x86_64-pc-windows-msvc/settings.html",
+                    ),
+                    ("x86_64-unknown-linux-gnu", "/dummy/latest/settings.html"),
+                ],
+            )?;
+
             assert_platform_links(
                 web,
                 "/dummy/0.4.0/dummy/",