keep queries in path_in_crate

enables `docs.rs/regex::Regex?go_to_first=true`

Author: Emilgardis

docker-compose.yml

@@ -4,6 +4,7 @@ services:
         build:
             context: .
             dockerfile: ./dockerfiles/Dockerfile
+        platform: linux/amd64
         depends_on:
             - db
             - s3
@@ -34,6 +35,7 @@ services:
         build:
             context: ./dockerfiles
             dockerfile: ./Dockerfile-postgres
+        platform: linux/amd64
         volumes:
             - postgres-data:/var/lib/postgresql/data
         environment:
@@ -50,6 +52,7 @@ services:
 
     s3:
         image: minio/minio
+        platform: linux/amd64
         entrypoint: >
             /bin/sh -c "
                 mkdir -p /data/rust-docs-rs;
@@ -77,6 +80,7 @@ services:
             retries: 10
 
     prometheus:
+        platform: linux/amd64
         build:
             context: ./dockerfiles
             dockerfile: ./Dockerfile-prometheus

src/web/rustdoc.rs

@@ -46,12 +46,19 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
         permanent: bool,
         path_in_crate: Option<&str>,
     ) -> IronResult<Response> {
-        if let Some(query) = req.url.query() {
-            url_str.push('?');
-            url_str.push_str(query);
-        } else if let Some(path) = path_in_crate {
+        let mut question_mark = false;
+        if let Some(path) = path_in_crate {
             url_str.push_str("?search=");
             url_str.push_str(path);
+            question_mark = true;
+        }
+        if let Some(query) = req.url.query() {
+            if !question_mark {
+                url_str.push('?');
+            } else {
+                url_str.push('&');
+            }
+            url_str.push_str(query);
         }
         let url = ctry!(req, Url::parse(&url_str));
         let (status_code, max_age) = if permanent {
@@ -1776,6 +1783,11 @@ mod test {
                 "/some_random_crate/latest/some_random_crate/?search=some::path",
                 web,
             )?;
+            assert_redirect(
+                "/some_random_crate::some::path?go_to_first=true",
+                "/some_random_crate/latest/some_random_crate/?search=some::path&go_to_first=true",
+                web,
+            )?;
 
             assert_redirect(
                 "/std::some::path",