Remove get_query_and_fragment function and only get query

Author: GuillaumeGomez

src/web/rustdoc.rs

@@ -362,13 +362,6 @@ pub(crate) async fn rustdoc_html_server_handler(
     // Pages generated by Rustdoc are not ready to be served with a CSP yet.
     csp.suppress(true);
 
-    fn get_query_and_fragment(uri: &Uri) -> Option<&str> {
-        // We cannot extract the fragment (`#`) with current `Uri` API so forced to do ugly
-        // things like that...
-        uri.path_and_query()
-            .and_then(|path_and_query| path_and_query.as_str().split_once('?').map(|s| s.1))
-    }
-
     // Convenience function to allow for easy redirection
     #[instrument]
     fn redirect(
@@ -379,9 +372,12 @@ pub(crate) async fn rustdoc_html_server_handler(
         uri: &Uri,
     ) -> AxumResult<AxumResponse> {
         trace!("redirect");
-        let query = get_query_and_fragment(uri);
         Ok(axum_cached_redirect(
-            EscapedURI::new(&format!("/{}/{}/{}", name, vers, path.join("/")), query).as_str(),
+            EscapedURI::new(
+                &format!("/{}/{}/{}", name, vers, path.join("/")),
+                uri.query(),
+            )
+            .as_str(),
             cache_policy,
         )?
         .into_response())
@@ -399,11 +395,10 @@ pub(crate) async fn rustdoc_html_server_handler(
     let matched_release = match_version(&mut conn, &params.name, &params.version)
         .await?
         .into_exactly_named_or_else(|corrected_name, req_version| {
-            let query = get_query_and_fragment(&uri);
             AxumNope::Redirect(
                 EscapedURI::new(
                     &format!("/{}/{}/{}", corrected_name, req_version, req_path.join("/")),
-                    query,
+                    uri.query(),
                 ),
                 CachePolicy::NoCaching,
             )