simplify code

src/cache.rs

@@ -13,12 +13,12 @@ use crate::{
     env_vars,
     metadata::{build_reindexed_channels, Output},
     packaging::Files,
-    recipe::parser::{Dependency, Requirements},
+    recipe::parser::{Dependency, Requirements, Source},
     render::resolved_dependencies::{
         install_environments, resolve_dependencies, FinalizedDependencies,
     },
     source::{
-        copy_dir::{copy_file, create_symlink, CopyDir, CopyOptions},
+        copy_dir::{copy_file, CopyDir, CopyOptions},
         fetch_sources,
     },
 };
@@ -44,6 +44,9 @@ pub struct Cache {
     /// The finalized dependencies
     pub finalized_dependencies: FinalizedDependencies,
 
+    /// The finalized sources
+    pub finalized_sources: Vec<Source>,
+
     /// The prefix files that are included in the cache
     pub prefix_files: Vec<PathBuf>,
 
@@ -111,44 +114,29 @@ impl Output {
         cache: Cache,
         cache_dir: PathBuf,
     ) -> Result<Output, miette::Error> {
-        let copy_options = CopyOptions {
-            skip_exist: true,
-            ..Default::default()
-        };
-        let cache_prefix = cache.prefix;
-
-        let mut paths_created = HashSet::new();
-        for file in &cache.prefix_files {
-            tracing::info!("Restoring from cache: {:?}", file);
-            let dest = self.prefix().join(file);
-            let source = &cache_dir.join("prefix").join(file);
-            copy_file(source, &dest, &mut paths_created, &copy_options).into_diagnostic()?;
-
-            // check if the symlink starts with the old prefix, and if yes, make the symlink
-            // absolute with the new prefix
-            if source.is_symlink() {
-                let symlink_target = fs::read_link(source).into_diagnostic()?;
-                if let Ok(rest) = symlink_target.strip_prefix(&cache_prefix) {
-                    let new_symlink_target = self.prefix().join(rest);
-                    fs::remove_file(&dest).into_diagnostic()?;
-                    create_symlink(&new_symlink_target, &dest).into_diagnostic()?;
-                }
-            }
-        }
+        let cache_prefix_dir = cache_dir.join("prefix");
+        let copied_prefix = CopyDir::new(&cache_prefix_dir, self.prefix())
+            .run()
+            .into_diagnostic()?;
 
         // restore the work dir files
         let cache_dir_work = cache_dir.join("work_dir");
-        CopyDir::new(
+        let copied_cache = CopyDir::new(
             &cache_dir_work,
             &self.build_configuration.directories.work_dir,
         )
         .run()
         .into_diagnostic()?;
 
-        tracing::info!("Restored source files from cache");
+        let combined_files = copied_prefix.copied_paths().len() + copied_cache.copied_paths().len();
+        tracing::info!(
+            "Restored {} source and prefix files from cache",
+            combined_files
+        );
 
         Ok(Output {
             finalized_cache_dependencies: Some(cache.finalized_dependencies.clone()),
+            finalized_cache_sources: Some(cache.finalized_sources.clone()),
             ..self.clone()
         })
     }
@@ -165,7 +153,7 @@ impl Output {
             let span = tracing::info_span!("Running cache build");
             let _enter = span.enter();
 
-            tracing::info!("Cache key: {:?}", self.cache_key().into_diagnostic()?);
+            tracing::info!("using cache key: {:?}", self.cache_key().into_diagnostic()?);
             let cache_key = format!("bld_{}", self.cache_key().into_diagnostic()?);
 
             let cache_dir = self
@@ -281,6 +269,7 @@ impl Output {
             let cache = Cache {
                 requirements: cache.requirements.clone(),
                 finalized_dependencies: finalized_dependencies.clone(),
+                finalized_sources: rendered_sources.clone(),
                 prefix_files: copied_files,
                 work_dir_files: work_dir_files.copied_paths().to_vec(),
                 prefix: self.prefix().to_path_buf(),

src/opt.rs

@@ -114,7 +114,7 @@ pub fn get_rattler_build_version() -> &'static str {
     env!("CARGO_PKG_VERSION")
 }
 
-#[allow(missing_docs)]
+/// The main application.
 #[derive(Parser)]
 #[clap(version = crate_version!())]
 pub struct App {
@@ -494,20 +494,24 @@ pub struct UploadOpts {
     pub common: CommonOpts,
 }
 
-/// Server type.
+/// The server type to upload to.
 #[derive(Clone, Debug, PartialEq, Parser)]
-#[allow(missing_docs)]
 pub enum ServerType {
+    /// A Quetz server
     Quetz(QuetzOpts),
+    /// An Artifactory server
     Artifactory(ArtifactoryOpts),
+    /// A prefix.dev server
     Prefix(PrefixOpts),
+    /// An anaconda.org server
     Anaconda(AnacondaOpts),
+    /// A conda-forge server
     #[clap(hide = true)]
     CondaForge(CondaForgeOpts),
 }
 
 #[derive(Clone, Debug, PartialEq, Parser)]
-/// Upload to aQuetz server.
+/// Upload to a Quetz server.
 /// Authentication is used from the keychain / auth-file.
 pub struct QuetzOpts {
     /// The URL to your Quetz server

src/system_tools.rs

@@ -11,9 +11,10 @@ use std::{
 };
 use thiserror::Error;
 
+/// Errors that can occur when working with system tools
 #[derive(Error, Debug)]
-#[allow(missing_docs)]
 pub enum ToolError {
+    /// The tool was not found on the system
     #[error("failed to find `{0}` ({1})")]
     ToolNotFound(Tool, which::Error),
 }