Remove Topbar type and replace it with RustdocPage

GuillaumeGomez · GuillaumeGomez · commit 9fc8cc2f6f18 · 2024-09-04T22:38:16.000+02:00
diff --git a/src/utils/html.rs b/src/utils/html.rs
@@ -1,5 +1,4 @@
-use crate::web::page::templates::{Body, Head, Topbar, Vendored};
-use crate::web::rustdoc::RustdocPage;
+use crate::web::page::templates::{Body, Head, RustdocPage, Vendored};
 use lol_html::element;
 use lol_html::errors::RewritingError;
 use rinja::Template;
@@ -21,7 +20,7 @@ pub(crate) fn rewrite_lol(
     let head_html = Head::new(data).render().unwrap();
     let vendored_html = Vendored.render().unwrap();
     let body_html = Body.render().unwrap();
-    let topbar_html = Topbar::new(data).render().unwrap();
+    let topbar_html = data.render().unwrap();
 
     // Before: <body> ... rustdoc content ... </body>
     // After:
diff --git a/src/web/page/templates.rs b/src/web/page/templates.rs
@@ -1,10 +1,9 @@
 use crate::error::Result;
 use crate::web::crate_details::CrateDetails;
-use crate::web::rustdoc::RustdocPage;
 use crate::web::MetaData;
 use anyhow::Context;
 use rinja::Template;
-use std::{fmt, ops::Deref, sync::Arc};
+use std::{fmt, sync::Arc};
 use tracing::trace;
 
 #[derive(Template)]
@@ -31,34 +30,20 @@ pub struct Body;
 
 #[derive(Template)]
 #[template(path = "rustdoc/topbar.html")]
-pub struct Topbar<'a> {
-    inner: &'a RustdocPage,
-    permalink_path: &'a str,
-    krate: &'a CrateDetails,
-    metadata: &'a MetaData,
-    current_target: &'a str,
-    latest_path: &'a str,
-}
-
-impl<'a> Topbar<'a> {
-    pub fn new(inner: &'a RustdocPage) -> Self {
-        Self {
-            inner,
-            permalink_path: &inner.permalink_path,
-            krate: &inner.krate,
-            metadata: &inner.metadata,
-            current_target: &inner.current_target,
-            latest_path: &inner.latest_path,
-        }
-    }
-}
-
-impl<'a> Deref for Topbar<'a> {
-    type Target = RustdocPage;
-
-    fn deref(&self) -> &Self::Target {
-        self.inner
-    }
+#[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
diff --git a/src/web/rustdoc.rs b/src/web/rustdoc.rs
@@ -14,8 +14,9 @@ use crate::{
         extractors::{DbConnection, Path},
         file::File,
         match_version,
+        page::templates::RustdocPage,
         page::TemplateData,
-        MetaData, ReqVersion,
+        ReqVersion,
     },
     AsyncStorage, Config, InstanceMetrics, RUSTDOC_STATIC_STORAGE_PREFIX,
 };
@@ -257,22 +258,6 @@ pub(crate) async fn rustdoc_redirector_handler(
     }
 }
 
-#[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,
