Fix a few more bugs

  - Avoid recursively copying a lib dir if it's the same as the
    package dir

  - Follow symbolic links for source files

  - Don't print unnecessary newlines

src/lib/build/mod.rs

@@ -169,8 +169,9 @@ pub fn compile_lib(
 
     let src_walker = source
         .meta()
-        .list_files(source.path(), &src_path, |_| true)?
-        .filter(|x| valid_file(&x));
+        .list_files(source.path(), &src_path, |x| {
+            x.path() != &layout.build
+        })?;
 
     clear_dir(&layout.build.join("lib"))?;
     copy_dir_iter(src_walker, &src_path, &layout.build.join("lib"))?;

src/lib/cli/build.rs

@@ -89,7 +89,6 @@ pub fn test(
             threads: ctx.threads,
         };
 
-        ctx.shell.println_empty(Verbosity::Normal);
         ctx.shell.println(
             style("[2/3]").dim().bold(),
             "Building targets...",
@@ -124,7 +123,6 @@ pub fn test(
         let q = JobQueue::new(sources, &root, Some(layout), &bctx, &ctx.logger, ctx.shell)?;
         q.exec(&bctx)?;
 
-        ctx.shell.println_empty(Verbosity::Normal);
         ctx.shell.println(
             style("[3/3]").dim().bold(),
             "Running tests...",
@@ -182,7 +180,6 @@ pub fn test(
             // pb.finish_and_clear();
         });
 
-        ctx.shell.println_empty(Verbosity::Normal);
         let mut errs = 0;
         while let Some(res) = results.try_pop() {
             match res {
@@ -261,7 +258,6 @@ pub fn install(
             threads: ctx.threads,
         };
 
-        ctx.shell.println_empty(Verbosity::Normal);
         ctx.shell.println(
             style("[2/3]").dim().bold(),
             "Building targets...",
@@ -277,7 +273,6 @@ pub fn install(
         let bins = q.exec(&bctx)?.1;
         let binc = bins.len();
 
-        ctx.shell.println_empty(Verbosity::Normal);
         ctx.shell.println(
             style("[3/3]").dim().bold(),
             "Installing binaries...",
@@ -392,7 +387,6 @@ pub fn repl(
             threads: ctx.threads,
         };
 
-        ctx.shell.println_empty(Verbosity::Normal);
         ctx.shell.println(
             style("[2/3]").dim().bold(),
             "Building targets...",
@@ -410,13 +404,11 @@ pub fn repl(
 
         // From here, we basically manually build a CompileInvocation, but tailor-made for the
         // repl command.
-        ctx.shell.println_empty(Verbosity::Normal);
         ctx.shell.println(
             style("[3/3]").dim().bold(),
             "Launching REPL...",
             Verbosity::Quiet,
         );
-        ctx.shell.println_empty(Verbosity::Quiet);
 
         if bctx.compiler.flavor().is_idris2() {
             bail!("The Idris 2 compiler doesn't currently support custom source paths, needed for the REPL.")
@@ -511,7 +503,6 @@ pub fn doc(ctx: &BuildCtx, project: &Path) -> Res<String> {
             threads: ctx.threads,
         };
 
-        ctx.shell.println_empty(Verbosity::Normal);
         ctx.shell.println(
             style("[2/2]").dim().bold(),
             "Building targets + root docs...",
@@ -605,7 +596,6 @@ pub fn build(
             threads: ctx.threads,
         };
 
-        ctx.shell.println_empty(Verbosity::Normal);
         ctx.shell.println(
             style("[2/2]").dim().bold(),
             "Building targets...",
@@ -867,8 +857,6 @@ pub fn solve_remote<F: FnMut(&Cache, Retriever, Graph<Summary>) -> Res<String>>(
     );
     let solve = Resolver::new(&retriever.logger.clone(), &mut retriever).solve()?;
 
-    ctx.shell.println_empty(Verbosity::Normal);
-
     f(&cache, retriever, solve)
 }
 

src/lib/package/manifest.rs

@@ -120,6 +120,7 @@ impl Manifest {
             .with_context(|e| format_err!("invalid excludes: {}", e))?;
 
         let walker = WalkDir::new(search_root)
+            .follow_links(true)
             .into_iter()
             .filter_entry(move |x| {
                 !excludes

src/lib/util/mod.rs

@@ -95,6 +95,7 @@ pub fn copy_dir_iter(walker: impl Iterator<Item = DirEntry>, from: &Path, to: &P
 
 pub fn copy_dir(from: &Path, to: &Path, gitless: bool) -> Res<()> {
     let walker = WalkDir::new(from)
+        .follow_links(true)
         .into_iter()
         .filter_entry(|x| x.path() != to && (!gitless || x.file_name() != ".git"))
         .filter_map(|x| {

src/lib/util/shell.rs

@@ -97,6 +97,12 @@ impl Shell {
         }
     }
 
+    pub fn print_plain(self, message: impl Display, min_verbosity: Verbosity) {
+        if self.verbosity >= min_verbosity {
+            print!("{}", message);
+        }
+    }
+
     pub fn println_empty(self, min_verbosity: Verbosity) {
         if self.verbosity >= min_verbosity {
             println!();