Remove get_metadata method

Author: GuillaumeGomez

src/web/build_details.rs

@@ -44,9 +44,6 @@ impl_axum_webpage! { BuildDetailsPage }
 
 // Used for template rendering.
 impl BuildDetailsPage {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        Some(&self.metadata)
-    }
     pub(crate) fn use_direct_platform_links(&self) -> bool {
         true
     }

src/web/builds.rs

@@ -54,9 +54,6 @@ struct BuildsPage {
 impl_axum_webpage! { BuildsPage }
 
 impl BuildsPage {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        Some(&self.metadata)
-    }
     pub(crate) fn use_direct_platform_links(&self) -> bool {
         true
     }

src/web/crate_details.rs

@@ -1,7 +1,6 @@
 use super::{match_version, MetaData};
 use crate::registry_api::OwnerKind;
 use crate::utils::{get_correct_docsrs_style_file, report_error};
-use crate::web::rustdoc::RustdocHtmlParams;
 use crate::{
     db::types::BuildStatus,
     impl_axum_webpage,
@@ -12,6 +11,7 @@ use crate::{
         error::{AxumNope, AxumResult},
         extractors::{DbConnection, Path},
         page::templates::filters,
+        rustdoc::RustdocHtmlParams,
         MatchedRelease, ReqVersion,
     },
     AsyncStorage,
@@ -32,6 +32,8 @@ use std::sync::Arc;
 
 // TODO: Add target name and versions
 
+#[derive(Template)]
+#[template(path = "crate/details.html")]
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct CrateDetails {
     pub(crate) name: String,
@@ -66,6 +68,12 @@ pub(crate) struct CrateDetails {
     pub(crate) crate_id: i32,
     /// Database id for this release
     pub(crate) release_id: i32,
+    pub(crate) csp_nonce: String,
+}
+
+impl_axum_webpage! {
+    CrateDetails,
+    cpu_intensive_rendering = true,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -251,6 +259,7 @@ impl CrateDetails {
             items_with_examples: krate.items_with_examples,
             crate_id: krate.crate_id,
             release_id: krate.release_id,
+            csp_nonce: String::new(),
         };
 
         // get owners
@@ -342,6 +351,11 @@ impl CrateDetails {
     pub fn latest_release(&self) -> Result<&Release> {
         latest_release(&self.releases).ok_or_else(|| anyhow!("crate without releases"))
     }
+
+    // Used by templates.
+    pub(crate) fn use_direct_platform_links(&self) -> bool {
+        true
+    }
 }
 
 pub(crate) fn latest_release(releases: &[Release]) -> Option<&Release> {
@@ -411,30 +425,6 @@ pub(crate) async fn releases_for_crate(
     Ok(releases)
 }
 
-#[derive(Template)]
-#[template(path = "crate/details.html")]
-#[derive(Debug, Clone, PartialEq)]
-struct CrateDetailsPage {
-    details: CrateDetails,
-    csp_nonce: String,
-}
-
-impl_axum_webpage! {
-    CrateDetailsPage,
-    cpu_intensive_rendering = true,
-}
-
-// Used by templates.
-impl CrateDetailsPage {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        Some(&self.details.metadata)
-    }
-
-    pub(crate) fn use_direct_platform_links(&self) -> bool {
-        true
-    }
-}
-
 #[derive(Deserialize, Clone, Debug)]
 pub(crate) struct CrateDetailHandlerParams {
     name: String,
@@ -471,11 +461,7 @@ pub(crate) async fn crate_details_handler(
         Err(e) => warn!("error fetching readme: {:?}", &e),
     }
 
-    let mut res = CrateDetailsPage {
-        details,
-        csp_nonce: String::new(),
-    }
-    .into_response();
+    let mut res = details.into_response();
     res.extensions_mut()
         .insert::<CachePolicy>(if req_version.is_latest() {
             CachePolicy::ForeverInCdn

src/web/features.rs

@@ -112,9 +112,6 @@ impl_axum_webpage! {
 }
 
 impl FeaturesPage {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        Some(&self.metadata)
-    }
     pub(crate) fn use_direct_platform_links(&self) -> bool {
         true
     }

src/web/mod.rs

@@ -731,12 +731,6 @@ pub(crate) struct AxumErrorPage {
     pub csp_nonce: String,
 }
 
-impl AxumErrorPage {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        None
-    }
-}
-
 impl_axum_webpage! {
     AxumErrorPage,
     status = |err| err.status,

src/web/page/templates.rs

@@ -35,6 +35,8 @@ pub struct Topbar<'a> {
     inner: &'a RustdocPage,
     permalink_path: &'a str,
     krate: &'a CrateDetails,
+    metadata: &'a MetaData,
+    current_target: &'a str,
 }
 
 impl<'a> Topbar<'a> {
@@ -43,12 +45,10 @@ impl<'a> Topbar<'a> {
             inner,
             permalink_path: &inner.permalink_path,
             krate: &inner.krate,
+            metadata: &inner.metadata,
+            current_target: &inner.current_target,
         }
     }
-
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        Some(&self.inner.metadata)
-    }
 }
 
 impl<'a> Deref for Topbar<'a> {

src/web/releases.rs

@@ -12,7 +12,7 @@ use crate::{
         extractors::{DbConnection, Path},
         match_version,
         page::templates::filters,
-        MetaData, ReqVersion,
+        ReqVersion,
     },
     BuildQueue, Config, InstanceMetrics,
 };
@@ -312,12 +312,6 @@ impl_axum_webpage! {
     cache_policy = |_| CachePolicy::ShortInCdnAndBrowser,
 }
 
-impl HomePage {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        None
-    }
-}
-
 pub(crate) async fn home_page(mut conn: DbConnection) -> AxumResult<impl IntoResponse> {
     let recent_releases =
         get_releases(&mut conn, 1, RELEASES_IN_HOME, Order::ReleaseTime, true).await?;
@@ -366,12 +360,6 @@ struct ViewReleases {
 
 impl_axum_webpage! { ViewReleases }
 
-impl ViewReleases {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        None
-    }
-}
-
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub(crate) enum ReleaseType {
     Recent,
@@ -525,12 +513,6 @@ impl Default for Search {
     }
 }
 
-impl Search {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        None
-    }
-}
-
 async fn redirect_to_random_crate(
     config: Arc<Config>,
     metrics: Arc<InstanceMetrics>,
@@ -739,12 +721,6 @@ struct ReleaseActivity {
     csp_nonce: String,
 }
 
-impl ReleaseActivity {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        None
-    }
-}
-
 impl_axum_webpage! { ReleaseActivity }
 
 pub(crate) async fn activity_handler(mut conn: DbConnection) -> AxumResult<impl IntoResponse> {
@@ -814,12 +790,6 @@ struct BuildQueuePage {
 
 impl_axum_webpage! { BuildQueuePage }
 
-impl BuildQueuePage {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        None
-    }
-}
-
 pub(crate) async fn build_queue_handler(
     Extension(build_queue): Extension<Arc<BuildQueue>>,
     Extension(pool): Extension<Pool>,

src/web/sitemap.rs

@@ -7,7 +7,7 @@ use crate::{
         error::{AxumNope, AxumResult},
         extractors::{DbConnection, Path},
         page::templates::filters,
-        AxumErrorPage, MetaData,
+        AxumErrorPage,
     },
     Config,
 };
@@ -122,12 +122,6 @@ struct AboutBuilds {
     csp_nonce: String,
 }
 
-impl AboutBuilds {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        None
-    }
-}
-
 impl_axum_webpage!(AboutBuilds);
 
 pub(crate) async fn about_builds_handler(
@@ -158,12 +152,6 @@ macro_rules! about_page {
         }
 
         impl_axum_webpage! { $ty }
-
-        impl $ty {
-            pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-                None
-            }
-        }
     };
 }
 

src/web/source.rs

@@ -171,9 +171,6 @@ impl_axum_webpage! {
 
 // Used in templates.
 impl SourcePage {
-    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
-        Some(&self.metadata)
-    }
     pub(crate) fn use_direct_platform_links(&self) -> bool {
         true
     }

templates/crate/build_details.html

@@ -10,7 +10,6 @@
 {%- endblock body_classes -%}
 
 {%- block topbar -%}
-  {%- set current_target = String::new() -%}
   {%- set latest_version = "" -%}
   {%- set latest_path = "" -%}
   {%- set target = "" -%}