experiment: wrap build.rs runs

fenollp · fenollp · commit 786e9b0c45e6 · 2025-05-18T17:01:17.000+02:00
Signed-off-by: Pierre Fenoll &lt;pierrefenoll@gmail.com&gt;
diff --git a/cargo-green/src/logging.rs b/cargo-green/src/logging.rs
@@ -64,5 +64,6 @@ fn unique_krate_types() {
 
     let all: HashSet<_> = ALL_CRATE_TYPES.iter().map(|ty| crate_type_for_logging(ty)).collect();
     assert_eq!(ALL_CRATE_TYPES.len(), all.len());
-    assert!(!all.contains(&'X')); // for build scripts
+    assert!(!all.contains(&'X')); // for building build scripts
+    assert!(!all.contains(&'Z')); // for executing build scripts
 }
diff --git a/cargo-green/src/main.rs b/cargo-green/src/main.rs
@@ -72,16 +72,21 @@ async fn main() -> Result<()> {
     const ENV_ROOT_PACKAGE_SETTINGS: &str = "CARGOGREEN_ROOT_PACKAGE_SETTINGS_";
 
     if let Ok(wrapper) = env::var("RUSTC_WRAPPER") {
+        // Now running as a subprocess
         if PathBuf::from(&wrapper).file_name() != Some(OsStr::new(PKG)) {
             bail!("A $RUSTC_WRAPPER other than `{PKG}` is already set: {wrapper}")
         }
-        // Now running as a subprocess
 
         let green = env::var(ENV_ROOT_PACKAGE_SETTINGS)
             .map_err(|_| anyhow!("BUG: ${ENV_ROOT_PACKAGE_SETTINGS} is unset"))?;
         let green = serde_json::from_str(&green)
             .map_err(|e| anyhow!("BUG: ${ENV_ROOT_PACKAGE_SETTINGS} is unreadable: {e}"))?;
 
+        // Dance to wrap build script execution: we patched the build.rs to call us back through here.
+        if let Ok(exe) = env::var(rustc_wrapper::ENV_EXECUTE_BUILDRS) {
+            return rustc_wrapper::exec_buildrs(green, exe.into()).await;
+        }
+
         let arg0 = env::args().nth(1);
         let args = env::args().skip(1).collect();
         let vars = env::vars().collect();
diff --git a/cargo-green/src/md.rs b/cargo-green/src/md.rs
@@ -16,7 +16,7 @@ use crate::{
 };
 
 #[cfg_attr(test, derive(Default))]
-#[derive(Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 pub(crate) struct Md {
     pub(crate) this: String,
diff --git a/cargo-green/src/rustc_wrapper.rs b/cargo-green/src/rustc_wrapper.rs
@@ -25,6 +25,9 @@ use crate::{
     tmp, PKG, VSN,
 };
 
+pub(crate) const ENV_EXECUTE_BUILDRS: &str = "CARGOGREEN_EXECUTE_BUILDRS_";
+const WRAP_BUILDRS: bool = true; // FIXME: finish experiment
+
 // NOTE: this RUSTC_WRAPPER program only ever gets called by `cargo`, so we save
 //       ourselves some trouble and assume std::path::{Path, PathBuf} are UTF-8.
 
@@ -112,6 +115,188 @@ async fn call_rustc(rustc: &str, args: Vec<String>) -> Result<()> {
     Ok(())
 }
 
+pub(crate) async fn exec_buildrs(green: Green, exe: Utf8PathBuf) -> Result<()> {
+    assert!(env::var_os(ENV).is_none(), "It's turtles all the way down!");
+    env::set_var(ENV, "1");
+
+    let krate_name = env::var("CARGO_PKG_NAME").expect("$CARGO_PKG_NAME");
+
+    let krate_version = env::var("CARGO_PKG_VERSION").expect("$CARGO_PKG_VERSION");
+
+    // exe: /target/release/build/proc-macro2-2f938e044e3f79bf/build-script-build
+    let Some((previous_md_path, previous_extra)) = || -> Option<_> {
+        // name: build_script_build
+        let name = exe.file_name()?.replace('-', "_");
+        // target_path: /target/release/build/proc-macro2-2f938e044e3f79bf
+        let target_path = exe.parent()?;
+        // extra: -2f938e044e3f79bf
+        let extra = target_path.file_name()?.trim_start_matches(&krate_name).to_owned();
+        // target_path: /target/release
+        let target_path = target_path.parent()?.parent()?;
+        // /target/release/build_script_build-2f938e044e3f79bf.toml
+        Some((target_path.join(format!("{name}{extra}.toml")), extra))
+    }() else {
+        bail!("BUG: malformed buildrs exe {exe:?}")
+    };
+
+    // $OUT_DIR: /target/release/build/proc-macro2-b97492fdd0201a99/out
+    let out_dir_var: Utf8PathBuf = env::var("OUT_DIR").expect("$OUT_DIR").into();
+    let Some((md_path, extra)) = || -> Option<_> {
+        // name: proc-macro2-b97492fdd0201a99
+        let name = out_dir_var.parent()?.file_name()?;
+        // extra: -b97492fdd0201a99
+        let extra = name.trim_start_matches(&krate_name).to_owned();
+        // /target/release/proc-macro2-b97492fdd0201a99.toml
+        Some((previous_md_path.with_file_name(format!("{name}.toml")), extra))
+    }() else {
+        bail!("BUG: malformed $OUT_DIR {out_dir_var:?}")
+    };
+
+    let full_krate_id = format!("Z {krate_name} {krate_version}{extra}");
+    logging::setup(&full_krate_id);
+
+    info!("{PKG}@{VSN} original args: {exe:?} green={green:?}");
+
+    do_exec_buildrs(
+        green,
+        &krate_name,
+        krate_version,
+        full_krate_id.replace(' ', "-"),
+        out_dir_var,
+        exe,
+        previous_md_path,
+        previous_extra,
+        md_path,
+        extra,
+    )
+    .await
+    .inspect_err(|e| error!("Error: {e}"))
+}
+
+#[expect(clippy::too_many_arguments)]
+async fn do_exec_buildrs(
+    green: Green,
+    krate_name: &str,
+    krate_version: String,
+    crate_id: String,
+    out_dir_var: Utf8PathBuf,
+    exe: Utf8PathBuf,
+    previous_md_path: Utf8PathBuf,
+    previous_extra: String,
+    md_path: Utf8PathBuf,
+    extra: String,
+) -> Result<()> {
+    let debug = maybe_log();
+
+    let run_stage = Stage::try_new(format!("run-{crate_id}"))?;
+    let out_stage = Stage::try_new(format!("ran{extra}"))?;
+
+    let code_stage = Stage::try_new(format!("cratesio-{krate_name}-{krate_version}"))?; // FIXME
+    let code_mount_src = "/extracted"; //FIXME
+    let code_mount_dst = format!("/home/pete/.cargo/registry/src/index.crates.io-0000000000000000/{krate_name}-{krate_version}"); //FIXME
+
+    let previous_out_stage = Stage::try_new(format!("out{previous_extra}"))?; //FIXME
+    let previous_out_dst = {
+        let name = exe.file_name().expect("PROOF: already ensured path has file_name");
+        let name = name.replacen('-', "_", 2);
+        format!("/{name}{previous_extra}")
+    };
+
+    let mut md = Md::new(&extra[1..]); // Drops leading dash
+    md.push_block(&RUST, green.image.base_image_inline.clone().unwrap());
+
+    let mut run_block = String::new();
+    run_block.push_str(&format!("FROM {RST} AS {run_stage}\n"));
+    run_block.push_str(&format!("SHELL {:?}\n", ["/bin/bash", "-eux", "-c"]));
+    run_block.push_str(&format!("WORKDIR {out_dir_var}\n"));
+    run_block.push_str("RUN \\\n");
+    run_block.push_str(&format!(
+        "  --mount=from={code_stage},source={code_mount_src},dst={code_mount_dst} \\\n"
+    ));
+    run_block.push_str(&format!(
+        "  --mount=from={previous_out_stage},source={previous_out_dst},dst={exe} \\\n"
+    ));
+    run_block.push_str(&format!("    env CARGO={:?} \\\n", "$(which cargo)"));
+    for (var, val) in env::vars().filter_map(|kv| fmap_env(kv, true)) {
+        run_block.push_str(&format!("        {var}={val} \\\n"));
+    }
+    run_block.push_str(&format!("        {ENV}=1 \\\n"));
+    for var in &green.set_envs {
+        if let Ok(val) = env::var(var) {
+            // let val = replace_target_dir_str(&val, TARGET_DIR.as_str(), VIRTUAL_TARGET_DIR);
+            warn!("passing ${var}={val:?} env through");
+            run_block.push_str(&format!("        {var}={val:?} \\\n"));
+        }
+    }
+    run_block.push_str(&format!("        {ENV_EXECUTE_BUILDRS}= \\\n"));
+    run_block.push_str(&format!("      {exe} \\\n"));
+    run_block.push_str(&format!("        1> >(sed 's/^/{MARK_STDOUT}/') \\\n"));
+    run_block.push_str(&format!("        2> >(sed 's/^/{MARK_STDERR}/' >&2)\n"));
+    md.push_block(&run_stage, run_block);
+
+    let mut out_block = String::new();
+    out_block.push_str(&format!("FROM scratch AS {out_stage}\n"));
+    out_block.push_str(&format!("COPY --from={run_stage} {out_dir_var}/*{extra}* /\n"));
+    md.push_block(&out_stage, out_block);
+
+    let containerfile_path = md_path.with_extension("Dockerfile");
+
+    let md = md; // Drop mut
+    md.write_to(&md_path)?;
+    drop(md_path);
+
+    let previous_md = Md::from_file(&previous_md_path)?;
+    if !previous_md.deps.is_empty() {
+        //FIXME: read/import/topolosort .deps
+        panic!(">>> {previous_md:?}")
+    }
+    let blocks = md.block_along_with_predecessors(&[previous_md]);
+
+    let mut containerfile = green.new_containerfile();
+    containerfile.pushln(md.rust_stage());
+    containerfile.nl();
+    containerfile.push(&blocks);
+    containerfile.write_to(&containerfile_path)?;
+    drop(containerfile);
+
+    fs::create_dir_all(&out_dir_var)
+        .map_err(|e| anyhow!("Failed to `mkdir -p {out_dir_var}`: {e}"))?;
+
+    let fallback = async move {
+        let mut cmd = Command::new(&exe);
+        let cmd = cmd.kill_on_drop(true);
+        // Do not unset ENV_EXECUTE_BUILDRS
+        let status = cmd
+            .spawn()
+            .map_err(|e| anyhow!("Failed to spawn {}: {e}", cmd.show()))?
+            .wait()
+            .await
+            .map_err(|e| anyhow!("Failed to wait {}: {e}", cmd.show()))?;
+        if !status.success() {
+            bail!("Failed in execute_buildrs")
+        }
+        Ok(())
+    };
+
+    if green.runner == Runner::None {
+        info!("Runner disabled, falling back...");
+        return fallback.await;
+    }
+    let res = build_out(&green, &containerfile_path, out_stage, &md.contexts, &out_dir_var).await;
+
+    if let Err(e) = res {
+        warn!("Falling back due to {e}");
+        if debug.is_none() {
+            // Bubble up actual error & outputs
+            return fallback
+                .await
+                .inspect(|()| eprintln!("BUG: {PKG} should not have encountered this error: {e}"));
+        }
+        return Err(e);
+    }
+    Ok(())
+}
+
 async fn wrap_rustc(
     green: Green,
     crate_name: &str,
@@ -364,12 +549,41 @@ async fn do_wrap_rustc(
     rustc_block.push_str("    { cat ./rustc-toolchain{,.toml} 2>/dev/null || true ; } && \\\n");
     //fixme? prefix with ::rustc-toolchain::
 
+    if WRAP_BUILDRS && buildrs {
+        // TODO: {extrafn} STDIO consts
+        // TODO: this won't work with e.g. tokio-decorated main fns (async + decorator needs duplicating)
+
+        rustc_block.push_str(&format!(
+            r#"    {{ \
+        cat {input} | sed 's/fn main/fn actual{uniq}_main/' >{input}~ && mv {input}~ {input} ; \
+        {{ \
+          echo ; \
+          echo 'fn main() {{' ; \
+          echo '    use std::env::{{args_os, var_os}};' ; \
+          echo '    if var_os("{ENV_EXECUTE_BUILDRS}").is_none() {{' ; \
+          echo '        use std::process::{{Command, Stdio}};' ; \
+          echo '        let mut cmd = Command::new("{PKG}");' ; \
+          echo '        cmd.stdin(Stdio::inherit()).stdout(Stdio::inherit()).stderr(Stdio::inherit());' ; \
+          echo '        cmd.env("{ENV_EXECUTE_BUILDRS}", args_os().next().expect("{PKG}: getting buildrs arg0"));' ; \
+          echo '        let res = cmd.spawn().expect("{PKG}: spawning buildrs").wait().expect("{PKG}: running builds");' ; \
+          echo '        assert!(res.success());' ; \
+          echo '    }} else {{' ; \
+          echo '        actual{uniq}_main()' ; \
+          echo '    }}' ; \
+          echo '}}' ; \
+        }} >>{input} ; \
+    }} && \
+"#,
+            uniq = extrafn.replace('-', "_"),
+        ));
+    }
+
     rustc_block.push_str(&format!("    env CARGO={:?} \\\n", "$(which cargo)"));
 
     for (var, val) in env::vars().filter_map(|kv| fmap_env(kv, buildrs)) {
         rustc_block.push_str(&format!("        {var}={val} \\\n"));
     }
-    rustc_block.push_str("        CARGOGREEN=1 \\\n");
+    rustc_block.push_str(&format!("        {ENV}=1 \\\n"));
     // => cargo upstream issue "pass env vars read/wrote by build script on call to rustc"
     // TODO whence https://github.com/rust-lang/cargo/issues/14444#issuecomment-2305891696
     for var in &green.set_envs {
@@ -586,9 +800,22 @@ fn fmap_env((var, val): (String, String), buildrs: bool) -> Option<(String, Stri
             debug!("env is set: {var}={val}");
         }
         let val = match var.as_str() {
+            "CARGO_PKG_DESCRIPTION" => "FIXME".to_owned(),
             "CARGO_MANIFEST_DIR" | "CARGO_MANIFEST_PATH" => {
                 rewrite_cratesio_index(Utf8Path::new(&val)).to_string()
             }
+            "TERM" => return None,
+            "RUSTC" => "rustc".to_owned(), // Rewrite host rustc so the base_image one can be used
+            // "CARGO_TARGET_DIR" | "CARGO_BUILD_TARGET_DIR" => {
+            //     virtual_target_dir(Utf8Path::new(&val)).to_string()
+            // }
+            // // TODO: a constant $CARGO_TARGET_DIR possible solution is to wrap build script as it runs,
+            // // ie. controlling all outputs. This should help: https://github.com/trailofbits/build-wrap/blob/d7f43b76e655e43755f68e28e9d729b4ed1dd115/src/wrapper.rs#L29
+            // //(dbcc)=> Dirty typenum v1.12.0: stale, https://github.com/rust-lang/cargo/blob/7987d4bfe683267ba179b42af55891badde3ccbf/src/cargo/core/compiler/fingerprint/mod.rs#L2030
+            // //=> /tmp/clis-dbcc_2-2-1/release/deps/typenum-32188cb0392f25b9.d
+            // "OUT_DIR" => virtual_target_dir(Utf8Path::new(&val)).to_string(),
+            "CARGO_TARGET_DIR" | "CARGO_BUILD_TARGET_DIR" => return None,
+            "OUT_DIR" => val,
             _ => val,
         };
         return Some((var, val));
diff --git a/recipes/buildxargs@1.4.0.Dockerfile b/recipes/buildxargs@1.4.0.Dockerfile
@@ -25,7 +25,7 @@ RUN \
         CARGO_MANIFEST_DIR="/home/pete/.cargo/registry/src/index.crates.io-0000000000000000/pico-args-0.5.0" \
         CARGO_MANIFEST_PATH="/home/pete/.cargo/registry/src/index.crates.io-0000000000000000/pico-args-0.5.0/Cargo.toml" \
         CARGO_PKG_AUTHORS="Yevhenii Reizner <razrfalcon@gmail.com>" \
-        CARGO_PKG_DESCRIPTION="An ultra simple CLI arguments parser." \
+        CARGO_PKG_DESCRIPTION=FIXME \
         CARGO_PKG_HOMEPAGE= \
         CARGO_PKG_LICENSE="MIT" \
         CARGO_PKG_LICENSE_FILE= \
@@ -38,7 +38,6 @@ RUN \
         CARGO_PKG_VERSION_MINOR="5" \
         CARGO_PKG_VERSION_PATCH="0" \
         CARGO_PKG_VERSION_PRE= \
-        TERM="xterm-256color" \
         CARGOGREEN=1 \
       rustc '--crate-name' 'pico_args' '--edition' '2018' '--error-format' 'json' '--json' 'diagnostic-rendered-ansi,artifacts,future-incompat' '--diagnostic-width' '190' '--crate-type' 'lib' '--emit' 'dep-info,metadata,link' '-C' 'opt-level=3' '-C' 'embed-bitcode=no' '--cfg' 'feature="default"' '--cfg' 'feature="eq-separator"' '--check-cfg' 'cfg(docsrs,test)' '--check-cfg' 'cfg(feature, values("combined-flags", "default", "eq-separator", "short-space-opt"))' '-C' 'metadata=9531c7e3ea64e837' '-C' 'extra-filename=-b8c41dbf50ca5479' '--out-dir' '/tmp/cargo-green--hack-caching/release/deps' '-C' 'strip=debuginfo' '-L' 'dependency=/tmp/cargo-green--hack-caching/release/deps' '--cap-lints' 'allow' /home/pete/.cargo/registry/src/index.crates.io-0000000000000000/pico-args-0.5.0/src/lib.rs \
         1> >(sed 's/^/::STDOUT:: /') \
@@ -67,7 +66,7 @@ RUN \
         CARGO_MANIFEST_DIR="/home/pete/.cargo/registry/src/index.crates.io-0000000000000000/shlex-1.3.0" \
         CARGO_MANIFEST_PATH="/home/pete/.cargo/registry/src/index.crates.io-0000000000000000/shlex-1.3.0/Cargo.toml" \
         CARGO_PKG_AUTHORS="comex <comexk@gmail.com>:Fenhl <fenhl@fenhl.net>:Adrian Taylor <adetaylor@chromium.org>:Alex Touchet <alextouchet@outlook.com>:Daniel Parks <dp+git@oxidized.org>:Garrett Berg <googberg@gmail.com>" \
-        CARGO_PKG_DESCRIPTION="Split a string into shell words, like Python's shlex." \
+        CARGO_PKG_DESCRIPTION=FIXME \
         CARGO_PKG_HOMEPAGE= \
         CARGO_PKG_LICENSE="MIT OR Apache-2.0" \
         CARGO_PKG_LICENSE_FILE= \
@@ -80,7 +79,6 @@ RUN \
         CARGO_PKG_VERSION_MINOR="3" \
         CARGO_PKG_VERSION_PATCH="0" \
         CARGO_PKG_VERSION_PRE= \
-        TERM="xterm-256color" \
         CARGOGREEN=1 \
       rustc '--crate-name' 'shlex' '--edition' '2015' '--error-format' 'json' '--json' 'diagnostic-rendered-ansi,artifacts,future-incompat' '--diagnostic-width' '190' '--crate-type' 'lib' '--emit' 'dep-info,metadata,link' '-C' 'opt-level=3' '-C' 'embed-bitcode=no' '--cfg' 'feature="default"' '--cfg' 'feature="std"' '--check-cfg' 'cfg(docsrs,test)' '--check-cfg' 'cfg(feature, values("default", "std"))' '-C' 'metadata=57dc058ec0bb424e' '-C' 'extra-filename=-96a741f581f4126a' '--out-dir' '/tmp/cargo-green--hack-caching/release/deps' '-C' 'strip=debuginfo' '-L' 'dependency=/tmp/cargo-green--hack-caching/release/deps' '--cap-lints' 'allow' /home/pete/.cargo/registry/src/index.crates.io-0000000000000000/shlex-1.3.0/src/lib.rs \
         1> >(sed 's/^/::STDOUT:: /') \
@@ -111,7 +109,7 @@ RUN \
         CARGO_MANIFEST_DIR="/home/pete/.cargo/registry/src/index.crates.io-0000000000000000/buildxargs-1.4.0" \
         CARGO_MANIFEST_PATH="/home/pete/.cargo/registry/src/index.crates.io-0000000000000000/buildxargs-1.4.0/Cargo.toml" \
         CARGO_PKG_AUTHORS="Pierre Fenoll <pierrefenoll@gmail.com>" \
-        CARGO_PKG_DESCRIPTION="xargs for BuildKit with docker buildx bake" \
+        CARGO_PKG_DESCRIPTION=FIXME \
         CARGO_PKG_HOMEPAGE= \
         CARGO_PKG_LICENSE="MIT" \
         CARGO_PKG_LICENSE_FILE= \
@@ -126,7 +124,6 @@ RUN \
         CARGO_PKG_VERSION_PRE= \
         CARGO_PRIMARY_PACKAGE="1" \
         CARGO_SBOM_PATH= \
-        TERM="xterm-256color" \
         CARGOGREEN=1 \
       rustc '--crate-name' 'buildxargs' '--edition' '2021' '--error-format' 'json' '--json' 'diagnostic-rendered-ansi,artifacts,future-incompat' '--diagnostic-width' '190' '--crate-type' 'lib' '--emit' 'dep-info,metadata,link' '-C' 'opt-level=3' '-C' 'embed-bitcode=no' '--check-cfg' 'cfg(docsrs,test)' '--check-cfg' 'cfg(feature, values())' '-C' 'metadata=0d0386ef92a0f4e5' '-C' 'extra-filename=-d78f4de4a17f92cd' '--out-dir' '/tmp/cargo-green--hack-caching/release/deps' '-C' 'strip=debuginfo' '-L' 'dependency=/tmp/cargo-green--hack-caching/release/deps' '--extern' 'pico_args=/tmp/cargo-green--hack-caching/release/deps/libpico_args-b8c41dbf50ca5479.rmeta' '--extern' 'shlex=/tmp/cargo-green--hack-caching/release/deps/libshlex-96a741f581f4126a.rmeta' '--cap-lints' 'allow' /home/pete/.cargo/registry/src/index.crates.io-0000000000000000/buildxargs-1.4.0/src/lib.rs \
         1> >(sed 's/^/::STDOUT:: /') \
@@ -150,7 +147,7 @@ RUN \
         CARGO_MANIFEST_DIR="/home/pete/.cargo/registry/src/index.crates.io-0000000000000000/buildxargs-1.4.0" \
         CARGO_MANIFEST_PATH="/home/pete/.cargo/registry/src/index.crates.io-0000000000000000/buildxargs-1.4.0/Cargo.toml" \
         CARGO_PKG_AUTHORS="Pierre Fenoll <pierrefenoll@gmail.com>" \
-        CARGO_PKG_DESCRIPTION="xargs for BuildKit with docker buildx bake" \
+        CARGO_PKG_DESCRIPTION=FIXME \
         CARGO_PKG_HOMEPAGE= \
         CARGO_PKG_LICENSE="MIT" \
         CARGO_PKG_LICENSE_FILE= \
@@ -165,7 +162,6 @@ RUN \
         CARGO_PKG_VERSION_PRE= \
         CARGO_PRIMARY_PACKAGE="1" \
         CARGO_SBOM_PATH= \
-        TERM="xterm-256color" \
         CARGOGREEN=1 \
       rustc '--crate-name' 'buildxargs' '--edition' '2021' '--error-format' 'json' '--json' 'diagnostic-rendered-ansi,artifacts,future-incompat' '--diagnostic-width' '190' '--crate-type' 'bin' '--emit' 'dep-info,link' '-C' 'opt-level=3' '-C' 'embed-bitcode=no' '--check-cfg' 'cfg(docsrs,test)' '--check-cfg' 'cfg(feature, values())' '-C' 'metadata=afebe456ed549d51' '-C' 'extra-filename=-39127c16f4d70192' '--out-dir' '/tmp/cargo-green--hack-caching/release/deps' '-C' 'strip=debuginfo' '-L' 'dependency=/tmp/cargo-green--hack-caching/release/deps' '--extern' 'buildxargs=/tmp/cargo-green--hack-caching/release/deps/libbuildxargs-d78f4de4a17f92cd.rlib' '--extern' 'pico_args=/tmp/cargo-green--hack-caching/release/deps/libpico_args-b8c41dbf50ca5479.rlib' '--extern' 'shlex=/tmp/cargo-green--hack-caching/release/deps/libshlex-96a741f581f4126a.rlib' '--cap-lints' 'allow' /home/pete/.cargo/registry/src/index.crates.io-0000000000000000/buildxargs-1.4.0/src/main.rs \
         1> >(sed 's/^/::STDOUT:: /') \

Original file line number	Diff line number	Diff line change
`@@ -64,5 +64,6 @@ fn unique_krate_types() {`
`64`	`64`
`65`	`65`	`let all: HashSet<_> = ALL_CRATE_TYPES.iter().map(\|ty\| crate_type_for_logging(ty)).collect();`
`66`	`66`	`assert_eq!(ALL_CRATE_TYPES.len(), all.len());`
`67`		`- assert!(!all.contains(&'X')); // for build scripts`
	`67`	`+ assert!(!all.contains(&'X')); // for building build scripts`
	`68`	`+ assert!(!all.contains(&'Z')); // for executing build scripts`
`68`	`69`	`}`