Remove permalink_path method

Author: GuillaumeGomez

src/web/build_details.rs

@@ -48,9 +48,6 @@ impl BuildDetailsPage {
     pub(crate) fn krate(&self) -> Option<&CrateDetails> {
         None
     }
-    pub(crate) fn permalink_path(&self) -> &str {
-        ""
-    }
     pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
         Some(&self.metadata)
     }

src/web/builds.rs

@@ -58,9 +58,6 @@ impl BuildsPage {
     pub(crate) fn krate(&self) -> Option<&CrateDetails> {
         None
     }
-    pub(crate) fn permalink_path(&self) -> &str {
-        ""
-    }
     pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
         Some(&self.metadata)
     }

src/web/crate_details.rs

@@ -430,10 +430,6 @@ impl CrateDetailsPage {
         None
     }
 
-    pub(crate) fn permalink_path(&self) -> &str {
-        ""
-    }
-
     pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
         Some(&self.details.metadata)
     }

src/web/features.rs

@@ -116,9 +116,6 @@ impl FeaturesPage {
     pub(crate) fn krate(&self) -> Option<&CrateDetails> {
         None
     }
-    pub(crate) fn permalink_path(&self) -> &str {
-        ""
-    }
     pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
         Some(&self.metadata)
     }

src/web/page/templates.rs

@@ -6,36 +6,6 @@ use rinja::Template;
 use std::{fmt, ops::Deref, sync::Arc};
 use tracing::trace;
 
-macro_rules! rustdoc_page {
-    ($name:ident, $path:literal $(, $meta:ident)?) => {
-        #[derive(Template)]
-        #[template(path = $path)]
-        pub struct $name<'a> {
-            inner: &'a RustdocPage,
-        }
-
-        impl<'a> $name<'a> {
-            pub fn new(inner: &'a RustdocPage) -> Self {
-                Self { inner }
-            }
-
-            $(
-                pub(crate) fn $meta(&self) -> Option<&MetaData> {
-                    Some(&self.inner.metadata)
-                }
-            )?
-        }
-
-        impl<'a> Deref for $name<'a> {
-            type Target = RustdocPage;
-
-            fn deref(&self) -> &Self::Target {
-                self.inner
-            }
-        }
-    };
-}
-
 #[derive(Template)]
 #[template(path = "rustdoc/head.html")]
 pub struct Head<'a> {
@@ -58,7 +28,33 @@ pub struct Vendored;
 #[template(path = "rustdoc/body.html")]
 pub struct Body;
 
-rustdoc_page!(Topbar, "rustdoc/topbar.html", get_metadata);
+#[derive(Template)]
+#[template(path = "rustdoc/topbar.html")]
+pub struct Topbar<'a> {
+    inner: &'a RustdocPage,
+    permalink_path: &'a str,
+}
+
+impl<'a> Topbar<'a> {
+    pub fn new(inner: &'a RustdocPage) -> Self {
+        Self {
+            inner,
+            permalink_path: &inner.permalink_path,
+        }
+    }
+
+    pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
+        Some(&self.inner.metadata)
+    }
+}
+
+impl<'a> Deref for Topbar<'a> {
+    type Target = RustdocPage;
+
+    fn deref(&self) -> &Self::Target {
+        self.inner
+    }
+}
 
 /// Holds all data relevant to templating
 #[derive(Debug)]

src/web/rustdoc.rs

@@ -318,11 +318,6 @@ impl RustdocPage {
         Some(&self.krate)
     }
 
-    // Used for template rendering.
-    pub(crate) fn permalink_path(&self) -> &str {
-        &self.permalink_path
-    }
-
     pub(crate) fn use_direct_platform_links(&self) -> bool {
         !self.latest_path.contains("/target-redirect/")
     }

src/web/source.rs

@@ -174,9 +174,6 @@ impl SourcePage {
     pub(crate) fn get_metadata(&self) -> Option<&MetaData> {
         Some(&self.metadata)
     }
-    pub(crate) fn permalink_path(&self) -> &str {
-        ""
-    }
     pub(crate) fn krate(&self) -> Option<&CrateDetails> {
         None
     }

templates/rustdoc/topbar.html

@@ -34,7 +34,7 @@
 
                     {%- if metadata.req_version|to_string == "latest" -%}
                     <li class="pure-menu-item">
-                        <a href="{{permalink_path()|safe}}" class="pure-menu-link description" id="permalink" title="Get a link to this specific version">
+                        <a href="{% if permalink_path is defined %}{{permalink_path|safe}}{% endif %}" class="pure-menu-link description" id="permalink" title="Get a link to this specific version">
                             {{ "link"|fas(false, false, "") }} Permalink
                         </a>
                     </li>