wip

Author: syphar

src/db/add_package.rs

@@ -10,6 +10,7 @@ use crate::{
 use anyhow::{Context, anyhow};
 use derive_more::{Deref, Display};
 use futures_util::stream::TryStreamExt;
+use semver::VersionReq;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use slug::slugify;
@@ -34,7 +35,7 @@ pub struct ReleaseId(pub i32);
 pub struct BuildId(pub i32);
 
 type DepOut = (String, String, String, bool);
-type DepIn = (String, String, Option<String>, Option<bool>);
+type DepIn = (String, VersionReq, Option<String>, Option<bool>);
 
 /// A crate dependency in our internal representation for releases.dependencies json.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Deref)]

src/web/crate_details.rs

@@ -18,6 +18,7 @@ use crate::{
         },
         headers::CanonicalUrl,
         match_version,
+        page::templates::{RenderBrands, RenderRegular, RenderSolid, filters},
     },
 };
 use anyhow::{Context, Result, anyhow};

src/web/rustdoc.rs

@@ -492,7 +492,7 @@ pub(crate) async fn rustdoc_html_server_handler(
     // Attempt to load the given file from storage.
     let blob = match storage
         .stream_rustdoc_file(
-            &params.name,
+            &params.name(),
             &krate.version,
             krate.latest_build_id,
             &storage_path,
@@ -520,7 +520,7 @@ pub(crate) async fn rustdoc_html_server_handler(
 
                 if storage
                     .rustdoc_file_exists(
-                        &params.name,
+                        &params.name(),
                         &krate.version,
                         krate.latest_build_id,
                         &params.storage_path(),
@@ -560,7 +560,7 @@ pub(crate) async fn rustdoc_html_server_handler(
                 error!(
                     krate = params.name(),
                     version = %krate.version,
-                    original_path = params.original_path().as_ref(),
+                    original_path = params.original_path(),
                     storage_path,
                     "Couldn't find crate documentation root on storage.
                         Something is wrong with the build."
@@ -652,7 +652,7 @@ pub(crate) async fn target_redirect_handler(
     trace!(storage_path, "checking if path exists in other version");
     let redirect_uri = if storage
         .rustdoc_file_exists(
-            &name,
+            &params.name(),
             &crate_details.version,
             crate_details.latest_build_id,
             &storage_path,

src/web/source.rs

@@ -229,7 +229,7 @@ pub(crate) async fn source_browser_handler(
          WHERE
              name = $1 AND
              version = $2"#,
-        params.name,
+        params.name(),
         version as _,
     )
     .fetch_one(&mut *conn)

templates/macros.html

@@ -159,7 +159,7 @@
 {% macro dependencies_list(dependencies, use_crate_details, if_empty) %}
     {%- for dep in dependencies -%}
         <li class="pure-menu-item">
-    {%- set dependency_params = RustdocParams::new(dep.name.to_owned()).with_req_version(ReqVersion::Semver(dep.req.parse::<semver::VersionReq>()?.clone())) -%}
+    {%- set dependency_params = RustdocParams::new(dep.name.to_owned()).with_req_version(ReqVersion::Semver(dep.req.clone())) -%}
             {%- set href -%}
             {%- if use_crate_details -%}
                 {%- set href = dependency_params.crate_details_url() -%}