Simplify LimitedCrateDetails

Author: GuillaumeGomez

src/web/rustdoc.rs

@@ -380,45 +380,36 @@ pub(crate) async fn rustdoc_redirector_handler(
 /// small wrapper around CrateDetails to limit serialized fields we hand
 /// to the template.
 /// Mostly to know what we have to serialize into the etag.
-pub struct LimitedCrateDetails(CrateDetails);
-
-impl From<CrateDetails> for LimitedCrateDetails {
-    fn from(value: CrateDetails) -> Self {
-        Self(value)
-    }
+pub struct LimitedCrateDetails {
+    parsed_license: Option<Vec<licenses::LicenseSegment>>,
+    homepage_url: Option<String>,
+    documentation_url: Option<String>,
+    repository_url: Option<String>,
+    owners: Vec<(String, String, OwnerKind)>,
+    dependencies: Vec<Dependency>,
+    total_items: Option<i32>,
+    documented_items: Option<i32>,
 }
 
-impl LimitedCrateDetails {
-    pub fn parsed_license(&self) -> Option<&[licenses::LicenseSegment]> {
-        self.0.parsed_license.as_deref()
-    }
-
-    pub fn homepage_url(&self) -> Option<&str> {
-        self.0.homepage_url.as_deref()
-    }
-
-    pub fn documentation_url(&self) -> Option<&str> {
-        self.0.documentation_url.as_deref()
-    }
-
-    pub fn repository_url(&self) -> Option<&str> {
-        self.0.repository_url.as_deref()
-    }
-
-    pub fn owners(&self) -> &[(String, String, OwnerKind)] {
-        self.0.owners.as_ref()
-    }
-
-    pub fn dependencies(&self) -> &[Dependency] {
-        self.0.dependencies.as_ref()
-    }
-
-    pub fn total_items(&self) -> Option<i32> {
-        self.0.total_items
-    }
-
-    pub fn documented_items(&self) -> Option<i32> {
-        self.0.documented_items
+impl From<CrateDetails> for LimitedCrateDetails {
+    fn from(mut value: CrateDetails) -> Self {
+        let parsed_license = std::mem::take(&mut value.parsed_license);
+        let homepage_url = std::mem::take(&mut value.homepage_url);
+        let documentation_url = std::mem::take(&mut value.documentation_url);
+        let repository_url = std::mem::take(&mut value.repository_url);
+        let owners = std::mem::take(&mut value.owners);
+        let dependencies = std::mem::take(&mut value.dependencies);
+
+        Self {
+            total_items: value.total_items,
+            documented_items: value.documented_items,
+            parsed_license,
+            homepage_url,
+            documentation_url,
+            repository_url,
+            owners,
+            dependencies,
+        }
     }
 }
 
@@ -427,14 +418,14 @@ impl bincode::Encode for LimitedCrateDetails {
         &self,
         encoder: &mut E,
     ) -> Result<(), bincode::error::EncodeError> {
-        self.parsed_license().encode(encoder)?;
-        self.homepage_url().encode(encoder)?;
-        self.documentation_url().encode(encoder)?;
-        self.repository_url().encode(encoder)?;
-        self.owners().encode(encoder)?;
-        self.dependencies().encode(encoder)?;
-        self.total_items().encode(encoder)?;
-        self.documented_items().encode(encoder)?;
+        self.parsed_license.encode(encoder)?;
+        self.homepage_url.encode(encoder)?;
+        self.documentation_url.encode(encoder)?;
+        self.repository_url.encode(encoder)?;
+        self.owners.encode(encoder)?;
+        self.dependencies.encode(encoder)?;
+        self.total_items.encode(encoder)?;
+        self.documented_items.encode(encoder)?;
         Ok(())
     }
 }

templates/rustdoc/topbar.html

@@ -41,7 +41,7 @@
                         </a>
                     </li>
 
-                    {%- if let Some(parsed_licenses) = krate.parsed_license() -%}
+                    {%- if let Some(parsed_licenses) = krate.parsed_license -%}
                         <li class="pure-menu-item">
                             <span class="pure-menu-link description">
                             {{- crate::icons::IconScaleUnbalancedFlip.render_solid(false, false, "") }}
@@ -66,7 +66,7 @@
                             <li class="pure-menu-heading">Links</li>
 
                             {# If the crate has a homepage, show a link to it #}
-                            {%- if let Some(homepage_url) = krate.homepage_url() -%}
+                            {%- if let Some(homepage_url) = krate.homepage_url -%}
                                 <li class="pure-menu-item">
                                     <a href="{{ homepage_url }}" class="pure-menu-link">
                                         {{ crate::icons::IconHouse.render_solid(false, false, "") }} Homepage
@@ -75,7 +75,7 @@
                             {%- endif -%}
 
                             {# If the crate has external docs, show a link #}
-                            {%- if let Some(documentation_url) = krate.documentation_url() -%}
+                            {%- if let Some(documentation_url) = krate.documentation_url -%}
                                 <li class="pure-menu-item">
                                     <a href="{{ documentation_url }}" title="Canonical documentation" class="pure-menu-link">
                                         {{ crate::icons::IconFileLines.render_regular(false, false, "") }} Documentation
@@ -84,7 +84,7 @@
                             {%- endif -%}
 
                             {# If the crate has a repo url, show it #}
-                            {%- if let Some(repository_url) = krate.repository_url() -%}
+                            {%- if let Some(repository_url) = krate.repository_url -%}
                                 <li class="pure-menu-item">
                                     <a href="{{ repository_url }}" class="pure-menu-link">
                                         {{ crate::icons::IconCodeBranch.render_solid(false, false, "") }} Repository
@@ -112,7 +112,7 @@
                         <ul class="pure-menu-list" id="topbar-owners">
                             <li class="pure-menu-heading">Owners</li>
 
-                            {%- for owner in krate.owners() -%}
+                            {%- for owner in krate.owners -%}
                                 <li class="pure-menu-item">
                                     <a href="https://crates.io/{{ owner.2 }}s/{{ owner.0 }}" class="pure-menu-link">
                                         {{ crate::icons::IconUser.render_solid(false, false, "") }} {{ owner.0 }}
@@ -132,7 +132,7 @@
                             <li class="pure-menu-item">
                                 <div class="pure-menu pure-menu-scrollable sub-menu" tabindex="-1">
                                     <ul class="pure-menu-list">
-                                        {% call macros::dependencies_list(dependencies=krate.dependencies(), use_crate_details = false, if_empty="") %}
+                                        {% call macros::dependencies_list(dependencies=krate.dependencies, use_crate_details = false, if_empty="") %}
                                     </ul>
                                 </div>
                             </li>
@@ -151,7 +151,7 @@
                         </ul>
                     </div>
                 </div>
-                {%- if let (Some(documented), Some(total)) = (krate.documented_items(), krate.total_items()) -%}
+                {%- if let (Some(documented), Some(total)) = (krate.documented_items, krate.total_items) -%}
                     {% set documented = documented as f32 %}
                     {% set total = total as f32 %}
                     {% set percent = documented * 100f32 / total %}