some more changes

starting to wonder if this is actually useful

Author: jyn514

Cargo.lock

@@ -10,7 +10,7 @@ use crate::{
     error::Result,
     index::api::{CrateData, CrateOwner, ReleaseData},
     storage::CompressionAlgorithm,
-    utils::MetadataPackage,
+    utils::{MetadataPackage, PackageExt},
 };
 use log::{debug, info};
 use postgres::Client;
@@ -206,11 +206,8 @@ fn convert_dependencies(pkg: &MetadataPackage) -> Vec<(String, String, String)>
         .iter()
         .map(|dependency| {
             let name = dependency.name.clone();
-            let version = dependency.req.clone();
-            let kind = dependency
-                .kind
-                .clone()
-                .unwrap_or_else(|| "normal".to_string());
+            let version = dependency.req.to_string();
+            let kind = dependency.kind.clone();
 
             (name, version, kind)
         })
@@ -250,7 +247,7 @@ fn get_optional_dependencies(pkg: &MetadataPackage) -> Vec<Feature> {
 
 /// Reads readme if there is any read defined in Cargo.toml of a Package
 fn get_readme(pkg: &MetadataPackage, source_dir: &Path) -> Result<Option<String>> {
-    let readme_path = source_dir.join(pkg.readme.as_deref().unwrap_or("README.md"));
+    let readme_path = source_dir.join(pkg.readme.as_deref().unwrap_or(Path::new("README.md")));
 
     if !readme_path.exists() {
         return Ok(None);
@@ -271,16 +268,11 @@ fn get_readme(pkg: &MetadataPackage, source_dir: &Path) -> Result<Option<String>
 }
 
 fn get_rustdoc(pkg: &MetadataPackage, source_dir: &Path) -> Result<Option<String>> {
-    if let Some(src_path) = &pkg.targets[0].src_path {
-        let src_path = Path::new(src_path);
-        if src_path.is_absolute() {
-            read_rust_doc(src_path)
-        } else {
-            read_rust_doc(&source_dir.join(src_path))
-        }
+    let src_path = &pkg.targets[0].src_path;
+    if src_path.is_absolute() {
+        read_rust_doc(src_path)
     } else {
-        // FIXME: should we care about metabuild targets?
-        Ok(None)
+        read_rust_doc(&source_dir.join(src_path))
     }
 }
 

src/db/add_package.rs

@@ -8,7 +8,7 @@ use crate::docbuilder::{crates::crates_from_path, Limits};
 use crate::error::Result;
 use crate::index::api::ReleaseData;
 use crate::storage::CompressionAlgorithms;
-use crate::utils::{copy_doc_dir, parse_rustc_version, CargoMetadata};
+use crate::utils::{copy_doc_dir, parse_rustc_version, CargoMetadata, PackageExt};
 use crate::{Config, Context, Index, Metrics, Storage};
 use docsrs_metadata::{Metadata, DEFAULT_TARGETS, HOST_TARGET};
 use failure::ResultExt;
@@ -284,7 +284,11 @@ impl RustwideBuilder {
                 err.context(format!("failed to load local package {}", path.display()))
             })?;
         let package = metadata.root();
-        self.build_package(&package.name, &package.version, PackageKind::Local(path))
+        self.build_package(
+            &package.name,
+            &package.version.to_string(),
+            PackageKind::Local(path),
+        )
     }
 
     pub fn build_package(

src/docbuilder/rustwide_builder.rs

@@ -61,9 +61,9 @@ pub(crate) struct Package {
 }
 */
 
-pub(crate) use cargo_metadata::Package;
+pub(crate) use cargo_metadata::{Metadata, Package};
 
-trait PackageExt {
+pub(crate) trait PackageExt {
     fn library_target(&self) -> Option<&Target>;
     fn is_library(&self) -> bool;
     fn normalize_package_name(&self, name: &str) -> String;

src/utils/cargo_metadata.rs

@@ -1,5 +1,6 @@
 //! Various utilities for docs.rs
 
+pub(crate) use self::cargo_metadata::{CargoMetadata, Package as MetadataPackage, PackageExt};
 pub(crate) use self::copy::copy_doc_dir;
 pub use self::daemon::start_daemon;
 pub use self::github_updater::GithubUpdater;
@@ -8,12 +9,11 @@ pub use self::queue::{get_crate_priority, remove_crate_priority, set_crate_prior
 pub use self::queue_builder::queue_builder;
 pub use self::release_activity_updater::update_release_activity;
 pub(crate) use self::rustc_version::parse_rustc_version;
-pub(crate) use cargo_metadata::{Metadata as CargoMetadata, Package as MetadataPackage};
 
 #[cfg(test)]
 pub(crate) use ::cargo_metadata::{Dependency, Target};
 
-//mod cargo_metadata;
+mod cargo_metadata;
 #[cfg(feature = "consistency_check")]
 pub mod consistency;
 mod copy;