Merge branch 'main' into nils/bytecode-interp

flaub · web-flow · commit 6d6bfebb4895 · 2025-01-24T17:29:36.000-08:00
diff --git a/zirgen/bootstrap/src/main.rs b/zirgen/bootstrap/src/main.rs
@@ -159,8 +159,8 @@ fn get_bazel_bin() -> PathBuf {
 }
 
 fn strip_locations_and_whitespace(text: &str) -> Result<String> {
-    // replace everything that might be a line number with '*'
-    let re = Regex::new(":[0-9]+")?;
+    // replace everything that might be a line number or a copyright date with '*'
+    let re = Regex::new("(:[0-9]+)|(Copyright [0-9]+ RISC)")?;
     let stripped = re.replace_all(text, "*");
 
     // Remove anything that might be changed by reformatting

Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,8 @@ fn get_bazel_bin() -> PathBuf {`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`fn strip_locations_and_whitespace(text: &str) -> Result<String> {`
`162`		`- // replace everything that might be a line number with '*'`
`163`		`- let re = Regex::new(":[0-9]+")?;`
	`162`	`+ // replace everything that might be a line number or a copyright date with '*'`
	`163`	`+ let re = Regex::new("(:[0-9]+)\|(Copyright [0-9]+ RISC)")?;`
`164`	`164`	`let stripped = re.replace_all(text, "*");`
`165`	`165`
`166`	`166`	`// Remove anything that might be changed by reformatting`