Attempt to retain current location when loading a different platform

docker-entrypoint.sh

@@ -4,7 +4,7 @@ set -euv
 
 export CRATESFYI_PREFIX=/opt/docsrs/prefix
 export DOCS_RS_DOCKER=true
-export RUST_LOG=cratesfyi,rustwide=info
+export RUST_LOG=${RUST_LOG-cratesfyi,rustwide=info}
 export PATH="$PATH:/build/target/release"
 
 # Try migrating the database multiple times if it fails

src/db/migrate.rs

@@ -310,6 +310,21 @@ pub fn migrate(version: Option<Version>, conn: &Connection) -> CratesfyiResult<(
             // downgrade query
             "DROP TABLE crate_priorities;",
         ),
+        migration!(
+            context,
+            // version
+            12,
+            // description
+            "Mark doc_targets non-nullable (it has a default of empty array anyway)",
+            // upgrade query
+            "
+                ALTER TABLE releases ALTER COLUMN doc_targets SET NOT NULL;
+            ",
+            // downgrade query
+            "
+                ALTER TABLE releases ALTER COLUMN doc_targets DROP NOT NULL;
+            "
+        ),
     ];
 
     for migration in migrations {

src/test/fakes.rs

@@ -97,10 +97,16 @@ impl<'a> FakeRelease<'a> {
     }
 
     pub(crate) fn default_target(mut self, target: &'a str) -> Self {
+        self = self.add_target(target);
         self.default_target = Some(target);
         self
     }
 
+    pub(crate) fn add_target(mut self, target: &str) -> Self {
+        self.doc_targets.push(target.into());
+        self
+    }
+
     pub(crate) fn binary(mut self, bin: bool) -> Self {
         self.has_docs = !bin;
         if bin {
@@ -112,9 +118,11 @@ impl<'a> FakeRelease<'a> {
     }
 
     pub(crate) fn add_platform<S: Into<String>>(mut self, platform: S) -> Self {
+        let platform = platform.into();
         let name = self.package.targets[0].name.clone();
-        let target = Target::dummy_lib(name, Some(platform.into()));
+        let target = Target::dummy_lib(name, Some(platform.clone()));
         self.package.targets.push(target);
+        self.doc_targets.push(platform);
         self
     }
 

src/test/mod.rs

@@ -93,6 +93,8 @@ pub(crate) struct TestEnvironment {
 
 impl TestEnvironment {
     fn new() -> Self {
+        // If this fails it's probably already initialized
+        let _ = env_logger::try_init();
         Self {
             db: OnceCell::new(),
             frontend: OnceCell::new(),

src/web/crate_details.rs

@@ -42,7 +42,7 @@ pub struct CrateDetails {
     github_issues: Option<i32>,
     pub(crate) metadata: MetaData,
     is_library: bool,
-    doc_targets: Option<Json>,
+    pub(crate) doc_targets: Vec<String>,
     license: Option<String>,
     documentation_url: Option<String>,
 }
@@ -185,6 +185,18 @@ impl CrateDetails {
             default_target: rows.get(0).get(25),
         };
 
+        let doc_targets = {
+            let data: Json = rows.get(0).get(22);
+            data.as_array()
+                .map(|array| {
+                    array
+                        .iter()
+                        .filter_map(|item| item.as_string().map(|s| s.to_owned()))
+                        .collect()
+                })
+                .unwrap_or_else(Vec::new)
+        };
+
         let mut crate_details = CrateDetails {
             name: rows.get(0).get(2),
             version: rows.get(0).get(3),
@@ -211,7 +223,7 @@ impl CrateDetails {
             github_issues: rows.get(0).get(20),
             metadata,
             is_library: rows.get(0).get(21),
-            doc_targets: rows.get(0).get(22),
+            doc_targets,
             license: rows.get(0).get(23),
             documentation_url: rows.get(0).get(24),
         };

src/web/routes.rs

@@ -87,6 +87,10 @@ pub(super) fn build_routes() -> Routes {
         "/crate/:name/:version/source/*",
         super::source::source_browser_handler,
     );
+    routes.internal_page(
+        "/crate/:name/:version/target-redirect/*",
+        super::rustdoc::target_redirect_handler,
+    );
 
     routes.rustdoc_page("/:crate", super::rustdoc::rustdoc_redirector_handler);
     routes.rustdoc_page("/:crate/", super::rustdoc::rustdoc_redirector_handler);