Move back RustdocPage to web::rustdoc

Author: GuillaumeGomez

src/utils/html.rs

@@ -1,4 +1,5 @@
-use crate::web::page::templates::{Body, Head, RustdocPage, Vendored};
+use crate::web::page::templates::{Body, Head, Vendored};
+use crate::web::rustdoc::RustdocPage;
 use lol_html::element;
 use lol_html::errors::RewritingError;
 use rinja::Template;

src/web/page/templates.rs

@@ -1,6 +1,5 @@
 use crate::error::Result;
-use crate::web::crate_details::CrateDetails;
-use crate::web::MetaData;
+use crate::web::rustdoc::RustdocPage;
 use anyhow::Context;
 use rinja::Template;
 use std::{fmt, sync::Arc};
@@ -28,24 +27,6 @@ pub struct Vendored;
 #[template(path = "rustdoc/body.html")]
 pub struct Body;
 
-#[derive(Template)]
-#[template(path = "rustdoc/topbar.html")]
-#[derive(Debug, Clone)]
-pub struct RustdocPage {
-    pub latest_path: String,
-    pub permalink_path: String,
-    pub inner_path: String,
-    // true if we are displaying the latest version of the crate, regardless
-    // of whether the URL specifies a version number or the string "latest."
-    pub is_latest_version: bool,
-    // true if the URL specifies a version using the string "latest."
-    pub is_latest_url: bool,
-    pub is_prerelease: bool,
-    pub krate: CrateDetails,
-    pub metadata: MetaData,
-    pub current_target: String,
-}
-
 /// Holds all data relevant to templating
 #[derive(Debug)]
 pub(crate) struct TemplateData {

src/web/rustdoc.rs

@@ -14,9 +14,9 @@ use crate::{
         extractors::{DbConnection, Path},
         file::File,
         match_version,
-        page::templates::RustdocPage,
+        page::templates::filters,
         page::TemplateData,
-        ReqVersion,
+        MetaData, ReqVersion,
     },
     AsyncStorage, Config, InstanceMetrics, RUSTDOC_STATIC_STORAGE_PREFIX,
 };
@@ -28,6 +28,7 @@ use axum::{
 };
 use lol_html::errors::RewritingError;
 use once_cell::sync::Lazy;
+use rinja::Template;
 use semver::Version;
 use serde::Deserialize;
 use std::{
@@ -258,6 +259,24 @@ pub(crate) async fn rustdoc_redirector_handler(
     }
 }
 
+#[derive(Template)]
+#[template(path = "rustdoc/topbar.html")]
+#[derive(Debug, Clone)]
+pub struct RustdocPage {
+    pub latest_path: String,
+    pub permalink_path: String,
+    pub inner_path: String,
+    // true if we are displaying the latest version of the crate, regardless
+    // of whether the URL specifies a version number or the string "latest."
+    pub is_latest_version: bool,
+    // true if the URL specifies a version using the string "latest."
+    pub is_latest_url: bool,
+    pub is_prerelease: bool,
+    pub krate: CrateDetails,
+    pub metadata: MetaData,
+    pub current_target: String,
+}
+
 impl RustdocPage {
     fn into_response(
         self,