Merge pull request #1595 from nnethercote/fix-cg_diff-regex

nnethercote · web-flow · commit 23edacef3a88 · 2023-05-29T09:27:34.000+10:00
Fix `cg_diff --mod-filename` regex.
diff --git a/collector/src/bin/collector.rs b/collector/src/bin/collector.rs
@@ -314,7 +314,7 @@ fn cg_diff(cgout1: &Path, cgout2: &Path, path: &Path) -> anyhow::Result<()> {
         anyhow::bail!("`cg_diff` not installed.");
     }
     let output = Command::new("cg_diff")
-        .arg("--mod-filename=s#/rustc/[^/]*/##")
+        .arg(r"--mod-filename=s/\/rustc\/[^\/]*\///")
         .arg("--mod-funcname=s/[.]llvm[.].*//")
         .arg(cgout1)
         .arg(cgout2)

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ fn cg_diff(cgout1: &Path, cgout2: &Path, path: &Path) -> anyhow::Result<()> {`
`314`	`314`	anyhow::bail!("`cg_diff` not installed.");
`315`	`315`	`}`
`316`	`316`	`let output = Command::new("cg_diff")`
`317`		`- .arg("--mod-filename=s#/rustc/[^/]*/##")`
	`317`	`+ .arg(r"--mod-filename=s/\/rustc\/[^\/]*\///")`
`318`	`318`	`.arg("--mod-funcname=s/[.]llvm[.].*//")`
`319`	`319`	`.arg(cgout1)`
`320`	`320`	`.arg(cgout2)`