Move the cargo add runtime to before any other cargo commands so that they work correctly always.

Author: kkysen

dynamic_instrumentation/src/main.rs

@@ -228,15 +228,6 @@ fn cargo_wrapper(rustc_wrapper: &Path) -> anyhow::Result<()> {
 
     let cargo = Cargo::new();
 
-    let cargo_metadata = cargo.metadata().exec()?;
-    let root_package = cargo_metadata
-        .root_package()
-        .ok_or_else(|| anyhow!("no root package found by `cargo`"))?;
-
-    cargo.run(|cmd| {
-        cmd.args(&["clean", "--package", root_package.name.as_str()]);
-    })?;
-
     // TODO(kkysen) Once we upgrade to 1.62, we can just use `cargo` and not specify `+stable`.
     // The problem currently is that `+stable` doesn't work on a resolved `$CARGO`,
     // which happens when this runs inside of `cargo test`,
@@ -254,6 +245,15 @@ fn cargo_wrapper(rustc_wrapper: &Path) -> anyhow::Result<()> {
         }
     })?;
 
+    let cargo_metadata = cargo.metadata().exec()?;
+    let root_package = cargo_metadata
+        .root_package()
+        .ok_or_else(|| anyhow!("no root package found by `cargo`"))?;
+
+    cargo.run(|cmd| {
+        cmd.args(&["clean", "--package", root_package.name.as_str()]);
+    })?;
+
     cargo.run(|cmd| {
         add_runtime_feature(&mut cargo_args);
         cmd.args(cargo_args)