Skip to content

Commit 9fcb5de

Browse files
committed
test(rustflags): Pull out metadata extraction
1 parent d1375ba commit 9fcb5de

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

tests/testsuite/rustflags.rs

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,25 +1522,6 @@ fn remap_path_prefix_works() {
15221522

15231523
#[cargo_test]
15241524
fn remap_path_prefix_ignored() {
1525-
let get_c_metadata_re =
1526-
regex::Regex::new(r".* (--crate-name [^ ]+).* (-C ?metadata=[^ ]+).*").unwrap();
1527-
let get_c_metadata = |output: RawOutput| {
1528-
let stderr = String::from_utf8(output.stderr).unwrap();
1529-
let mut c_metadata = get_c_metadata_re
1530-
.captures_iter(&stderr)
1531-
.map(|c| {
1532-
let (_, [name, c_metadata]) = c.extract();
1533-
format!("{name} {c_metadata}")
1534-
})
1535-
.collect::<Vec<_>>();
1536-
assert!(
1537-
!c_metadata.is_empty(),
1538-
"`{get_c_metadata_re:?}` did not match:\n```\n{stderr}\n```"
1539-
);
1540-
c_metadata.sort();
1541-
c_metadata.join("\n")
1542-
};
1543-
15441525
let p = project().file("src/lib.rs", "").build();
15451526

15461527
let build_output = p
@@ -1562,6 +1543,26 @@ fn remap_path_prefix_ignored() {
15621543
assert_data_eq!(rustc_c_metadata, build_c_metadata);
15631544
}
15641545

1546+
fn get_c_metadata(output: RawOutput) -> String {
1547+
let get_c_metadata_re =
1548+
regex::Regex::new(r".* (--crate-name [^ ]+).* (-C ?metadata=[^ ]+).*").unwrap();
1549+
1550+
let stderr = String::from_utf8(output.stderr).unwrap();
1551+
let mut c_metadata = get_c_metadata_re
1552+
.captures_iter(&stderr)
1553+
.map(|c| {
1554+
let (_, [name, c_metadata]) = c.extract();
1555+
format!("{name} {c_metadata}")
1556+
})
1557+
.collect::<Vec<_>>();
1558+
assert!(
1559+
!c_metadata.is_empty(),
1560+
"`{get_c_metadata_re:?}` did not match:\n```\n{stderr}\n```"
1561+
);
1562+
c_metadata.sort();
1563+
c_metadata.join("\n")
1564+
}
1565+
15651566
#[cargo_test]
15661567
fn host_config_rustflags_with_target() {
15671568
// regression test for https://github.com/rust-lang/cargo/issues/10206

0 commit comments

Comments
 (0)