Switch to using cargo metadata instead of cargo read-manifest (llvm-ml#20)

Author: boomanaiden154

corpus_descriptions/azure-sdk-for-rust.json

@@ -0,0 +1,6 @@
+{
+    "repo_name": "azure-sdk-for-rust",
+    "git_repo": "https://github.com/Azure/azure-sdk-for-rust.git",
+    "build_system": "cargo",
+    "commit_sha": "7fe4da3b4388f6be5aa3049cb3e0658425ce3295"
+}

llvm_ir_dataset_utils/builders/cargo_builder.py

@@ -11,39 +11,55 @@
 
 
 def get_targets_from_manifest(source_dir):
-  command_vector = ["cargo", "read-manifest"]
+  command_vector = ["cargo", "metadata", "--no-deps"]
   try:
     with subprocess.Popen(
         command_vector, stdout=subprocess.PIPE, cwd=source_dir) as process:
       out, err = process.communicate()
       manifest = json.loads(out.decode("utf-8"))
-    targets = manifest["targets"]
-    target_tuples = []
-    for target in targets:
-      target_tuples.append((target["kind"][0], target["name"]))
-    return target_tuples
+    targets = []
+    for package in manifest["packages"]:
+      for target in package["targets"]:
+        targets.append({
+            "name": target["name"],
+            "kind": target["kind"][0],
+            "package": package["name"],
+            "version": package["version"]
+        })
+    return targets
   except:
     return []
 
 
 def build_all_targets(source_dir, build_dir):
   targets_list = get_targets_from_manifest(source_dir)
   for target in targets_list:
-    logging.info(f"Building target {target[1]} of type {target[0]}")
+    logging.info(
+        f"Building target {target['name']} of type {target['kind']} from package {target['package']}"
+    )
     perform_build(source_dir, build_dir, target)
-    logging.info(f"Finished building target {target[1]} of type {target[0]}")
+    logging.info(
+        f"Finished building target {target['name']} of type {target['kind']} from package {target['package']}"
+    )
 
 
 def perform_build(source_dir, build_dir, target):
   build_env = os.environ.copy()
   build_env["CARGO_TARGET_DIR"] = build_dir
-  build_command_vector = ["cargo", "rustc", "--all-features"]
-  if target[0] == "lib":
+  build_command_vector = [
+      "cargo", "rustc", "--all-features", "-p",
+      f"{target['package']}@{target['version']}"
+  ]
+  if target['kind'] == "lib":
     build_command_vector.append("--lib")
-  elif target[0] == "test":
-    build_command_vector.extend(["--test", target[1]])
-  elif target[0] == "bench":
-    build_command_vector.extend(["--bench", target[1]])
+  elif target['kind'] == "test":
+    build_command_vector.extend(["--test", target['name']])
+  elif target['kind'] == "bench":
+    build_command_vector.extend(["--bench", target['name']])
+  elif target['kind'] == "bin":
+    build_command_vector.extend(["--bin", target['name']])
+  elif target['kind'] == "example":
+    build_command_vector.extend(["--example", target['name']])
   else:
     logging.warn("Unrecognized target type, not building.")
     return
@@ -57,7 +73,9 @@ def perform_build(source_dir, build_dir, target):
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE)
   except:
-    logging.warn(f"Failed to build target {target[1]} of type {target[0]}")
+    logging.warn(
+        f"Failed to build target {target['name']} of type {target['kind']} from package {target['package']}"
+    )
 
 
 def extract_ir(build_dir, corpus_dir):

llvm_ir_dataset_utils/tools/build_crate_from_repository.py

@@ -40,7 +40,7 @@ def main(_):
   elif FLAGS.repository_list is not None:
     with open(FLAGS.repository_list) as repository_list_file:
       crates_list = repository_list_file.read().splitlines()
-  
+
   for index, crate_to_build in enumerate(crates_list):
     corpus_description = {
         'git_repo': crate_to_build,
@@ -50,7 +50,7 @@ def main(_):
     }
 
     builder.parse_and_build_from_description(corpus_description, FLAGS.base_dir,
-                                            FLAGS.corpus_dir)
+                                             FLAGS.corpus_dir)
 
 
 if __name__ == '__main__':