update

Author: tgross35

ci/run.sh

@@ -64,7 +64,7 @@ symcheck+=(-- build-and-check)
 
 build_intrinsics_test() {
     # Mostly we want to check that `cargo build` works, but we also go via
-    # symcheck here to look for duplicates.
+    # symcheck here to see if any duplicates sneak in somehow.
     "${symcheck[@]}" \
         --target "$target" --verbose \
         --manifest-path builtins-test-intrinsics/Cargo.toml "$@"

crates/symbol-check/src/main.rs

@@ -11,6 +11,8 @@ use object::read::archive::{ArchiveFile, ArchiveMember};
 use object::{Object, ObjectSymbol, Symbol, SymbolKind, SymbolScope, SymbolSection};
 use serde_json::Value;
 
+const CHECK_LIBRARIES: &[&str] = &["compiler_builtins", "builtins_test_intrinsics"];
+
 const USAGE: &str = "Usage:
 
     symbol-check build-and-check CARGO_ARGS ...
@@ -40,7 +42,8 @@ fn main() {
     }
 }
 
-/// Run `cargo build` with the provided additional arguments.
+/// Run `cargo build` with the provided additional arguments, collecting the list of created
+/// libraries.
 fn exec_cargo_with_args(args: &[&str]) -> Vec<PathBuf> {
     let mut cmd = Command::new("cargo")
         .arg("build")
@@ -52,41 +55,39 @@ fn exec_cargo_with_args(args: &[&str]) -> Vec<PathBuf> {
 
     let stdout = cmd.stdout.take().unwrap();
     let reader = BufReader::new(stdout);
+    let mut rlibs = Vec::new();
 
-    let mut x = Vec::new();
-
-    for m in reader.lines() {
-        let m = m.expect("failed to read line");
-        println!("{m}");
+    for line in reader.lines() {
+        let line = line.expect("failed to read line");
+        println!("{line}"); // tee to stdout
 
-        let j: Value = serde_json::from_str(&m).expect("failed to deserialize");
+        // Select only steps that create files
+        let j: Value = serde_json::from_str(&line).expect("failed to deserialize");
         if j["reason"] != "compiler-artifact" {
             continue;
         }
 
-        for fname in j["filenames"].as_array().expect("filenames not an array") {
-            let path = fname.as_str().expect("file name not a string");
-            let p = PathBuf::from(path);
-
-            if let Some(ex) = p.extension()
-                && ex == "rlib"
-                && p.file_name()
-                    .unwrap()
-                    .to_str()
-                    .unwrap()
-                    .contains("compiler_builtins")
-            {
-                x.push(p);
+        // Find rlibs in the created file list that match our
+        for fpath in j["filenames"].as_array().expect("filenames not an array") {
+            let path = fpath.as_str().expect("file name not a string");
+            let path = PathBuf::from(path);
+
+            if path.extension().is_some_and(|ex| ex == "rlib") {
+                let fname = path.file_name().unwrap().to_str().unwrap();
+
+                if CHECK_LIBRARIES.iter().any(|lib| fname.contains(lib)) {
+                    rlibs.push(path);
+                }
             }
         }
     }
 
     cmd.wait().expect("failed to wait on Cargo");
 
-    assert!(!x.is_empty(), "no compiler_builtins rlibs found");
-    println!("Collected the following rlibs to check: {x:#?}");
+    assert!(!rlibs.is_empty(), "no compiler_builtins rlibs found");
+    println!("Collected the following rlibs to check: {rlibs:#?}");
 
-    x
+    rlibs
 }
 
 #[expect(unused)] // only for printing