Adds support for bindeps in crate universe (#2226)

Fixes #1739, #2031, #2168.

Author: csmulhern

crate_universe/Cargo.lock

@@ -27,7 +27,7 @@ default = ["cargo"]
 [dependencies]
 anyhow = "1.0.71"
 cargo_metadata = "0.15.4"
-cargo_toml = "0.15.2"
+cargo_toml = "0.17.0"
 cargo-lock = "9.0.0"
 cargo-platform = "0.1.2"
 cfg-expr = "0.15.0"
@@ -47,7 +47,7 @@ sha2 = "0.10.7"
 tempfile = "3.6.0"
 tera = "1.19.0"
 textwrap = "0.16.0"
-toml = "0.7.6"
+toml = "0.8.0"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.17"
 

crate_universe/Cargo.toml

@@ -75,12 +75,17 @@ impl MetadataGenerator for Generator {
             cargo_lock::Lockfile::load(lock_path)?
         };
 
+        let mut other_options = vec!["--locked".to_owned()];
+        if self.cargo_bin.is_nightly()? {
+            other_options.push("-Zbindeps".to_owned());
+        }
+
         let metadata = self
             .cargo_bin
             .metadata_command()?
             .current_dir(manifest_dir)
             .manifest_path(manifest_path.as_ref())
-            .other_options(["--locked".to_owned()])
+            .other_options(other_options)
             .exec()?;
 
         Ok((metadata, lockfile))
@@ -108,6 +113,9 @@ impl Cargo {
     pub fn command(&self) -> Result<Command> {
         let mut command = Command::new(&self.path);
         command.envs(self.env()?);
+        if self.is_nightly()? {
+            command.arg("-Zbindeps");
+        }
         Ok(command)
     }
 
@@ -132,6 +140,16 @@ impl Cargo {
         Ok(full_version.clone().unwrap())
     }
 
+    pub fn is_nightly(&self) -> Result<bool> {
+        let full_version = self.full_version()?;
+        let version_str = full_version.split(' ').nth(1);
+        if let Some(version_str) = version_str {
+            let version = Version::parse(version_str).context("Failed to parse cargo version")?;
+            return Ok(version.pre.as_str() == "nightly");
+        }
+        bail!("Couldn't parse cargo version");
+    }
+
     pub fn use_sparse_registries_for_crates_io(&self) -> Result<bool> {
         let full_version = self.full_version()?;
         let version_str = full_version.split(' ').nth(1);

crate_universe/src/metadata.rs

@@ -46,6 +46,28 @@ load(
 
 cargo_aliases_crate_repositories()
 
+###############################################################################
+# C A R G O   B I N D E P S
+###############################################################################
+
+crates_repository(
+    name = "crate_index_cargo_bindeps",
+    cargo_lockfile = "//cargo_bindeps:Cargo.lock",
+    generate_binaries = True,
+    # `generator` is not necessary in official releases.
+    # See load satement for `cargo_bazel_bootstrap`.
+    generator = "@cargo_bazel_bootstrap//:cargo-bazel",
+    manifests = ["//cargo_bindeps:Cargo.toml"],
+    rust_version = "nightly",
+)
+
+load(
+    "@crate_index_cargo_bindeps//:defs.bzl",
+    cargo_bindeps_crate_repositories = "crate_repositories",
+)
+
+cargo_bindeps_crate_repositories()
+
 ###############################################################################
 # C A R G O   L O C A L
 ###############################################################################

examples/crate_universe/WORKSPACE.bazel

@@ -0,0 +1,23 @@
+load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
+
+alias(
+    name = "hyperfine",
+    actual = "@crate_index_cargo_bindeps//:hyperfine__hyperfine",
+    tags = ["manual"],
+)
+
+rust_library(
+    name = "bindeps",
+    srcs = glob(["**/*.rs"]),
+    data = [":hyperfine"],
+    edition = "2018",
+    rustc_env = {
+        "HYPERFINE": "$(rootpath :hyperfine)",
+    },
+)
+
+rust_test(
+    name = "unit_test",
+    crate = ":bindeps",
+    edition = "2018",
+)