WIP

Author: syphar

src/db/add_package.rs

@@ -10,8 +10,6 @@ use crate::{
 use anyhow::{Context, anyhow};
 use derive_more::{Deref, Display};
 use futures_util::stream::TryStreamExt;
-use semver::VersionReq;
-use serde::Serialize;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use slug::slugify;

src/test/fakes.rs

@@ -1,13 +1,4 @@
 use super::TestDatabase;
-
-use crate::docbuilder::{DocCoverage, RUSTDOC_JSON_COMPRESSION_ALGORITHMS};
-use crate::error::Result;
-use crate::registry_api::{CrateData, CrateOwner, ReleaseData};
-use crate::storage::{
-    AsyncStorage, CompressionAlgorithm, RustdocJsonFormatVersion, compress, rustdoc_archive_path,
-    rustdoc_json_path, source_archive_path,
-};
-use crate::utils::{Dependency, MetadataPackage, cargo_metadata::Target};
 use crate::{
     db::{
         BuildId, ReleaseId,
@@ -23,7 +14,7 @@ use crate::{
         AsyncStorage, CompressionAlgorithm, RustdocJsonFormatVersion, compress,
         rustdoc_archive_path, rustdoc_json_path, source_archive_path,
     },
-    utils::{Dependency, MetadataPackage, Target},
+    utils::{Dependency, MetadataPackage, cargo_metadata::Target},
 };
 use anyhow::{Context, bail};
 use base64::{Engine, engine::general_purpose::STANDARD as b64};

src/web/crate_details.rs

@@ -1,21 +1,13 @@
-use super::{MetaData, match_version};
 use crate::{
     AsyncStorage,
     db::{
-        BuildId, CrateId, ReleaseId,
+        BuildId, CrateId, ReleaseDependency, ReleaseId,
         types::{BuildStatus, version::Version},
     },
     impl_axum_webpage,
     registry_api::OwnerKind,
     storage::PathNotFoundError,
-    utils::get_correct_docsrs_style_file,
-use crate::{
-    AsyncStorage,
-    db::{BuildId, CrateId, ReleaseDependency, ReleaseId, types::BuildStatus},
-    impl_axum_webpage,
-    registry_api::OwnerKind,
-    storage::PathNotFoundError,
-    utils::{Dependency, get_correct_docsrs_style_file, report_error},
+    utils::{Dependency, get_correct_docsrs_style_file},
     web::{
         MatchedRelease, MetaData, ReqVersion,
         cache::CachePolicy,
@@ -26,7 +18,6 @@ use crate::{
         },
         headers::CanonicalUrl,
         match_version,
-        page::templates::{RenderBrands, RenderRegular, RenderSolid, filters},
     },
 };
 use anyhow::{Context, Result, anyhow};
@@ -38,8 +29,6 @@ use axum::{
 use chrono::{DateTime, Utc};
 use futures_util::stream::TryStreamExt;
 use log::warn;
-use serde::Deserialize;
-use semver::Version;
 use serde_json::Value;
 use std::sync::Arc;
 

src/web/extractors/rustdoc.rs

@@ -816,9 +816,11 @@ fn find_static_route_suffix<'a, 'b>(route: &'a str, path: &'b str) -> Option<Str
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test::{AxumResponseTestExt, AxumRouterTestExt};
+    use crate::{
+        db::types::version::Version,
+        test::{AxumResponseTestExt, AxumRouterTestExt},
+    };
     use axum::{Router, routing::get};
-    use semver::Version;
     use test_case::test_case;
 
     static KRATE: &str = "krate";

src/web/mod.rs

@@ -2,14 +2,11 @@
 
 pub mod page;
 
-use crate::db::CrateId;
-use crate::db::ReleaseId;
-use crate::db::types::{BuildStatus, version::Version};
-use crate::utils::get_correct_docsrs_style_file;
-use crate::utils::report_error;
-use crate::web::page::templates::{RenderBrands, RenderSolid, filters};
 use crate::{
-    db::{CrateId, types::BuildStatus},
+    db::{
+        CrateId,
+        types::{BuildStatus, version::Version},
+    },
     utils::{get_correct_docsrs_style_file, report_error},
     web::page::templates::{RenderBrands, RenderSolid, filters},
 };

src/web/releases.rs

@@ -26,15 +26,13 @@ use base64::{Engine, engine::general_purpose::STANDARD as b64};
 use chrono::{DateTime, Utc};
 use futures_util::stream::TryStreamExt;
 use itertools::Itertools;
-use semver::Version;
 use serde::{Deserialize, Serialize};
 use sqlx::Row;
 use std::{
     collections::{BTreeMap, HashMap, HashSet},
     str,
     sync::Arc,
 };
-use tracing::warn;
 use tracing::{trace, warn};
 use url::form_urlencoded;
 
@@ -120,28 +118,23 @@ pub(crate) async fn get_releases(
         }
     );
 
-    sqlx::query(query.as_str())
+    Ok(sqlx::query(query.as_str())
         .bind(limit)
         .bind(offset)
         .bind(filter_failed)
         .fetch(conn)
-        .err_into::<anyhow::Error>()
-        .and_then(|row| async move {
-            let version: semver::Version = row.get::<String, _>(1).parse()?;
-
-            Ok(Release {
-                name: row.get(0),
-                version,
-                description: row.get(2),
-                target_name: row.get(3),
-                rustdoc_status: row.get::<Option<bool>, _>(4).unwrap_or(false),
-                build_time: row.get(5),
-                stars: row.get::<Option<i32>, _>(6).unwrap_or(0),
-                has_unyanked_releases: None,
-            })
+        .map_ok(|row| Release {
+            name: row.get(0),
+            version: row.get(1),
+            description: row.get(2),
+            target_name: row.get(3),
+            rustdoc_status: row.get::<Option<bool>, _>(4).unwrap_or(false),
+            build_time: row.get(5),
+            stars: row.get::<Option<i32>, _>(6).unwrap_or(0),
+            has_unyanked_releases: None,
         })
         .try_collect()
-        .await
+        .await?)
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -211,22 +204,20 @@ async fn get_search_results(
         &names[..],
     )
     .fetch(&mut *conn)
-    .err_into::<anyhow::Error>()
-    .and_then(|row| async move {
-        let version: semver::Version = row.version.parse()?;
-        Ok((
+    .map_ok(|row| {
+        (
             row.name.clone(),
             Release {
                 name: row.name,
-                version,
+                version: row.version,
                 description: row.description,
                 build_time: row.last_build_time,
                 target_name: row.target_name,
                 rustdoc_status: row.rustdoc_status.unwrap_or(false),
                 stars: row.stars.unwrap_or(0),
                 has_unyanked_releases: row.has_unyanked_releases,
             },
-        ))
+        )
     })
     .try_collect()
     .await?;
@@ -765,14 +756,7 @@ pub(crate) async fn build_queue_handler(
     .fetch_all(&mut *conn)
     .await?
     .into_iter()
-    .map(|rec| {
-        (
-            rec.name,
-            rec.version
-                .parse()
-                .expect("all versions in the db are valid"),
-        )
-    })
+    .map(|rec| (rec.name, rec.version))
     .collect();
 
     let mut rebuild_queue = Vec::new();
@@ -782,11 +766,8 @@ pub(crate) async fn build_queue_handler(
         .into_iter()
         .filter(|krate| {
             !in_progress_builds.iter().any(|(name, version)| {
-                // temporary, until I migrated the other version occurences to semver::Version
-                // We know that in the DB we only have semver
-                let krate_version: Version = krate.version.parse().unwrap();
                 // use `.any` instead of `.contains` to avoid cloning name& version for the match
-                *name == krate.name && *version == krate_version
+                *name == krate.name && *version == krate.version
             })
         })
         .collect_vec();

src/web/rustdoc.rs

@@ -2,7 +2,6 @@
 
 use crate::{
     AsyncStorage, Config, InstanceMetrics, RUSTDOC_STATIC_STORAGE_PREFIX,
-    db::{Pool, types::version::Version},
     storage::{
         CompressionAlgorithm, RustdocJsonFormatVersion, StreamingBlob,
         compression::compression_from_file_extension, rustdoc_archive_path, rustdoc_json_path,
@@ -36,7 +35,6 @@ use axum::{
     response::{IntoResponse, Response as AxumResponse},
 };
 use http::{HeaderValue, Uri, header};
-use http::{HeaderValue, header};
 use serde::Deserialize;
 use std::{
     collections::HashMap,
@@ -560,9 +558,9 @@ pub(crate) async fn rustdoc_html_server_handler(
                 )
             {
                 error!(
-                    krate = params.name,
+                    krate = params.name(),
                     version = %krate.version,
-                    original_path = original_path.as_ref(),
+                    original_path = params.original_path().as_ref(),
                     storage_path,
                     "Couldn't find crate documentation root on storage.
                         Something is wrong with the build."
@@ -895,6 +893,7 @@ mod test {
     use super::*;
     use crate::{
         Config,
+        db::types::version::Version,
         docbuilder::RUSTDOC_JSON_COMPRESSION_ALGORITHMS,
         registry_api::{CrateOwner, OwnerKind},
         storage::compression::file_extension_for,

src/web/source.rs

@@ -1,7 +1,6 @@
 use crate::{
     AsyncStorage,
-    db::BuildId,
-    db::{BuildId, Pool, types::version::Version},
+    db::{BuildId, types::version::Version},
     impl_axum_webpage,
     storage::PathNotFoundError,
     web::{
@@ -23,8 +22,6 @@ use askama::Template;
 use axum::{Extension, response::IntoResponse};
 use axum_extra::headers::HeaderMapExt;
 use mime::Mime;
-use semver::Version;
-use serde::Deserialize;
 use std::{cmp::Ordering, sync::Arc};
 use tracing::instrument;
 
@@ -245,7 +242,7 @@ pub(crate) async fn source_browser_handler(
     let (blob, is_file_too_large) = if !params.path_is_folder() {
         match storage
             .fetch_source_file(
-                &params.name,
+                &params.name(),
                 &version,
                 row.latest_build_id,
                 inner_path,