From 9fcb5de16e5dc442b11be3642e2c83e1600225d6 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Thu, 5 Dec 2024 15:22:18 -0600
Subject: [PATCH] test(rustflags): Pull out metadata extraction

---
 tests/testsuite/rustflags.rs | 39 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/tests/testsuite/rustflags.rs b/tests/testsuite/rustflags.rs
index 74fd2a195..25c28bfa5 100644
--- a/tests/testsuite/rustflags.rs
+++ b/tests/testsuite/rustflags.rs
@@ -1522,25 +1522,6 @@ fn remap_path_prefix_works() {
 
 #[cargo_test]
 fn remap_path_prefix_ignored() {
-    let get_c_metadata_re =
-        regex::Regex::new(r".* (--crate-name [^ ]+).* (-C ?metadata=[^ ]+).*").unwrap();
-    let get_c_metadata = |output: RawOutput| {
-        let stderr = String::from_utf8(output.stderr).unwrap();
-        let mut c_metadata = get_c_metadata_re
-            .captures_iter(&stderr)
-            .map(|c| {
-                let (_, [name, c_metadata]) = c.extract();
-                format!("{name} {c_metadata}")
-            })
-            .collect::<Vec<_>>();
-        assert!(
-            !c_metadata.is_empty(),
-            "`{get_c_metadata_re:?}` did not match:\n```\n{stderr}\n```"
-        );
-        c_metadata.sort();
-        c_metadata.join("\n")
-    };
-
     let p = project().file("src/lib.rs", "").build();
 
     let build_output = p
@@ -1562,6 +1543,26 @@ fn remap_path_prefix_ignored() {
     assert_data_eq!(rustc_c_metadata, build_c_metadata);
 }
 
+fn get_c_metadata(output: RawOutput) -> String {
+    let get_c_metadata_re =
+        regex::Regex::new(r".* (--crate-name [^ ]+).* (-C ?metadata=[^ ]+).*").unwrap();
+
+    let stderr = String::from_utf8(output.stderr).unwrap();
+    let mut c_metadata = get_c_metadata_re
+        .captures_iter(&stderr)
+        .map(|c| {
+            let (_, [name, c_metadata]) = c.extract();
+            format!("{name} {c_metadata}")
+        })
+        .collect::<Vec<_>>();
+    assert!(
+        !c_metadata.is_empty(),
+        "`{get_c_metadata_re:?}` did not match:\n```\n{stderr}\n```"
+    );
+    c_metadata.sort();
+    c_metadata.join("\n")
+}
+
 #[cargo_test]
 fn host_config_rustflags_with_target() {
     // regression test for https://github.com/rust-lang/cargo/issues/10206