build: restore cargo build output somewhat

Somewhere along the line in either cargo itself or cargo_metadata
real-time build progress is no longer printed. Not a cause of concern,
but if there is no build cache, it will look like an invocation is
stuck. But errors are now printed as expected, which is the important
part.

Perhaps some rudimentary spinner should be added in the future?

Author: tmplt

Cargo.lock

@@ -13,7 +13,7 @@ description = "RTIC Scope backend"
 [dependencies]
 structopt = "0.3"
 clap = "2.33"
-cargo_metadata = "0.11"
+cargo_metadata = "0.14"
 syn = "1"
 proc-macro2 = "1"
 quote = "1"

Cargo.toml

@@ -92,7 +92,7 @@ impl CargoWrapper {
         Ok((
             CargoWrapper {
                 target_dir: Some(metadata.target_directory.clone().canonicalize().map_err(
-                    |e| CargoError::CannotCanonicalize(metadata.target_directory.clone(), e),
+                    |e| CargoError::CannotCanonicalize(metadata.target_directory.clone().into(), e),
                 )?),
                 app_metadata: Some(metadata),
             },
@@ -136,7 +136,7 @@ impl CargoWrapper {
             cargo.arg(self.target_dir());
         }
 
-        cargo.args(&["--message-format", "json-diagnostic-rendered-ansi"]);
+        cargo.arg("--message-format=json-diagnostic-rendered-ansi");
         cargo.stdout(Stdio::piped());
         cargo.stderr(Stdio::piped());
 
@@ -166,15 +166,7 @@ impl CargoWrapper {
         let stdout = BufReader::new(child.stdout.take().expect("Pipe to cargo process failed"));
         let stderr = BufReader::new(child.stderr.take().expect("Pipe to cargo process failed"));
 
-        // NOTE(collect) ensure we don't block stdout which could
-        // prevent the process from exiting
-        let messages = Message::parse_stream(stdout)
-            .chain(Message::parse_stream(stderr))
-            .collect::<Vec<_>>();
-
-        let status = child
-            .wait()
-            .map_err(|e| CargoError::CargoBuildSpawnWaitError(e))?;
+        let messages = Message::parse_stream(stdout).chain(Message::parse_stream(stderr));
 
         let mut target_artifact: Option<Artifact> = None;
         for message in messages {
@@ -199,6 +191,10 @@ impl CargoWrapper {
             }
         }
 
+        let status = child
+            .wait()
+            .map_err(|e| CargoError::CargoBuildSpawnWaitError(e))?;
+
         if !status.success() {
             return Err(CargoError::CargoBuildExecFailed(status, opts));
         }
@@ -227,15 +223,15 @@ fn find_manifest_path(artifact: &cargo_metadata::Artifact) -> Result<PathBuf, Ca
             path.push("Cargo.toml");
             path.exists()
         } {
-            return Ok(path);
+            return Ok(path.into());
         } else {
             path.pop(); // remove Cargo.toml
             if path.pop() {
                 // move up a directory
                 continue;
             }
 
-            return Err(CargoError::CannotFindManifest(start_path()));
+            return Err(CargoError::CannotFindManifest(start_path().into()));
         }
     }
 }

src/build.rs

@@ -241,6 +241,7 @@ fn main_try() -> Result<(), RTICScopeError> {
 
     // Build RTIC application to be traced, and create a wrapper around
     // cargo, reusing the target directory of the application.
+    log::status("Building", "RTIC target application...".to_string());
     let (cargo, artifact) = CargoWrapper::new(
         &env::current_dir()?,
         {
@@ -252,11 +253,7 @@ fn main_try() -> Result<(), RTICScopeError> {
         .to_cargo_options(),
     )?;
 
-    let prog = format!(
-        "{} ({})",
-        artifact.target.name,
-        artifact.target.src_path.display()
-    );
+    let prog = format!("{} ({})", artifact.target.name, artifact.target.src_path,);
     log::status(
         "Recovering",
         format!("metadata for {} and preparing target...", prog,),
@@ -579,8 +576,13 @@ fn trace(
     let flashloader = opts
         .flash_options
         .probe_options
-        .build_flashloader(&mut session, &elf)?;
-    flash::run_flash_download(&mut session, &elf, &opts.flash_options, flashloader)?;
+        .build_flashloader(&mut session, &elf.clone().into_std_path_buf())?;
+    flash::run_flash_download(
+        &mut session,
+        &elf.clone().into_std_path_buf(),
+        &opts.flash_options,
+        flashloader,
+    )?;
 
     let mut trace_source: Box<dyn sources::Source> = if let Some(dev) = &opts.serial {
         Box::new(sources::TTYSource::new(

src/main.rs

@@ -39,7 +39,7 @@ impl FileSink {
 
         // generate a short descroption on the format
         // "blinky-gbaadf00-dirty-2021-06-16T17:13:16.trace"
-        let repo = find_git_repo(artifact.target.src_path.clone())?;
+        let repo = find_git_repo(artifact.target.src_path.clone().into())?;
         let git_shortdesc = repo
             .describe(&DescribeOptions::new().show_commit_oid_as_fallback(true))?
             .format(Some(