Auto merge of #140 - Xanewok:deps, r=Manishearth

Bump Cargo to 0.48

The main change is in 8938495, which works around rust-lang/cargo#8236 that introduced different mechanism to output stdio/shell-based data.

Everything now goes through cargo `Shell` type so `std::io::set_print` trick stopped working - instead, we create our custom shell and fetch the build plan through it.

r? `@Manishearth` or `@ibabushkin`

Author: bors

Cargo.toml

@@ -11,16 +11,16 @@ license-file = "LICENSE"
 edition = "2018"
 
 [dependencies]
-cargo = "0.44"
+cargo = "0.48"
 crates-io = "0.32"
 curl = "0.4.21"
 env_logger = "0.7"
 anyhow = "1.0.27"
 log = "0.4"
-rand = "0.7"
 semver = "0.9"
 serde = { version = "1.0.84", features = ["derive"] }
 serde_json = "1.0.34"
 
 [dev-dependencies]
 quickcheck = "0.9"
+rand = "0.7"

src/bin/cargo-semver.rs

@@ -8,17 +8,15 @@ use cargo::core::{Package, PackageId, Source, SourceId, Workspace};
 use cargo::sources::RegistrySource;
 use curl::easy::Easy;
 use log::debug;
-use rand::Rng;
 use rustc_session::getopts;
 use serde::Deserialize;
 use std::collections::HashSet;
 use std::{
-    env,
-    fs::File,
-    io::BufReader,
+    env, io,
     io::Write,
     path::{Path, PathBuf},
     process::{Command, Stdio},
+    sync::{Arc, RwLock},
 };
 
 pub type Result<T> = cargo::util::CargoResult<T>;
@@ -481,13 +479,15 @@ impl<'a> WorkInfo<'a> {
         // we need the build plan to find our build artifacts
         opts.build_config.build_plan = true;
 
-        if let Some(target) = matches.opt_str("target") {
-            let target = cargo::core::compiler::CompileTarget::new(&target);
-            if let Ok(target) = target {
-                let kind = cargo::core::compiler::CompileKind::Target(target);
-                opts.build_config.requested_kind = kind;
-            }
-        }
+        let compile_kind = if let Some(target) = matches.opt_str("target") {
+            let target = cargo::core::compiler::CompileTarget::new(&target)?;
+
+            let kind = cargo::core::compiler::CompileKind::Target(target);
+            opts.build_config.requested_kinds = vec![kind];
+            kind
+        } else {
+            cargo::core::compiler::CompileKind::Host
+        };
 
         if let Some(s) = matches.opt_str("features") {
             opts.features = s.split(' ').map(str::to_owned).collect();
@@ -501,36 +501,35 @@ impl<'a> WorkInfo<'a> {
             format!("-C metadata={}", if current { "new" } else { "old" }),
         );
 
-        let mut outdir = env::temp_dir();
-        // The filename is randomized to avoid clashes when multiple cargo-semver instances are running.
-        outdir.push(&format!(
-            "cargo_semver_{}_{}_{}",
-            name,
-            current,
-            rand::thread_rng().gen::<u32>()
-        ));
+        // Capture build plan from a separate Cargo invocation
+        let output = VecWrite(Arc::new(RwLock::new(Vec::new())));
+
+        let mut file_write = cargo::core::Shell::from_write(Box::new(output.clone()));
+        file_write.set_verbosity(cargo::core::Verbosity::Quiet);
 
-        // redirection gang
-        let outfile = File::create(&outdir)?;
-        let old_stdio = std::io::set_print(Some(Box::new(outfile)));
+        let old_shell = std::mem::replace(&mut *config.shell(), file_write);
 
-        let _ = cargo::ops::compile(&self.workspace, &opts)?;
+        cargo::ops::compile(&self.workspace, &opts)?;
 
-        std::io::set_print(old_stdio);
+        let _ = std::mem::replace(&mut *config.shell(), old_shell);
+        let plan_output = output.read()?;
 
         // actually compile things now
         opts.build_config.build_plan = false;
 
         let compilation = cargo::ops::compile(&self.workspace, &opts)?;
         env::remove_var("RUSTFLAGS");
 
-        let build_plan: BuildPlan = serde_json::from_reader(BufReader::new(File::open(&outdir)?))?;
+        let build_plan: BuildPlan = serde_json::from_slice(&plan_output)
+            .map_err(|_| anyhow::anyhow!("Can't read build plan"))?;
 
         // TODO: handle multiple outputs gracefully
         for i in &build_plan.invocations {
             if let Some(kind) = i.target_kind.get(0) {
                 if kind.contains("lib") && i.package_name == name {
-                    return Ok((i.outputs[0].clone(), compilation.deps_output));
+                    let deps_output = &compilation.deps_output[&compile_kind];
+
+                    return Ok((i.outputs[0].clone(), deps_output.clone()));
                 }
             }
         }
@@ -565,3 +564,30 @@ pub fn find_on_crates_io(crate_name: &str) -> Result<crates_io::Crate> {
                 })
         })
 }
+
+/// Thread-safe byte buffer that implements `io::Write`.
+#[derive(Clone)]
+struct VecWrite(Arc<RwLock<Vec<u8>>>);
+
+impl VecWrite {
+    pub fn read(&self) -> io::Result<std::sync::RwLockReadGuard<'_, Vec<u8>>> {
+        self.0
+            .read()
+            .map_err(|_| io::Error::new(io::ErrorKind::Other, "lock poison"))
+    }
+    pub fn write(&self) -> io::Result<std::sync::RwLockWriteGuard<'_, Vec<u8>>> {
+        self.0
+            .write()
+            .map_err(|_| io::Error::new(io::ErrorKind::Other, "lock poison"))
+    }
+}
+
+impl io::Write for VecWrite {
+    fn write(&mut self, data: &[u8]) -> io::Result<usize> {
+        let mut lock = Self::write(self)?;
+        io::Write::write(&mut *lock, data)
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}