Skip to content

Commit 76067f7

Browse files
feat: extract the delimiter to a const value for uniformity
1 parent 4c4cefd commit 76067f7

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

crates/intrinsic-test/src/common/compare.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use itertools::Itertools;
22
use rayon::prelude::*;
33
use std::{collections::HashMap, process::Command};
44

5+
pub const INTRINSIC_DELIMITER: &str = "############";
56
fn runner_command(runner: &str) -> Command {
67
let mut it = runner.split_whitespace();
78
let mut cmd = Command::new(it.next().unwrap());
@@ -27,7 +28,7 @@ pub fn compare_outputs(intrinsic_name_list: &Vec<String>, runner: &str, target:
2728
);
2829
let (c, rust) = match (c, rust) {
2930
(Ok(c), Ok(rust)) => (c, rust),
30-
a => panic!("{a:#?}"),
31+
failure => panic!("Failed to run: {failure:#?}"),
3132
};
3233

3334
if !c.status.success() {
@@ -56,11 +57,11 @@ pub fn compare_outputs(intrinsic_name_list: &Vec<String>, runner: &str, target:
5657
.replace("-nan", "nan");
5758

5859
let c_output_map = c
59-
.split("############")
60+
.split(INTRINSIC_DELIMITER)
6061
.filter_map(|output| output.trim().split_once("\n"))
6162
.collect::<HashMap<&str, &str>>();
6263
let rust_output_map = rust
63-
.split("############")
64+
.split(INTRINSIC_DELIMITER)
6465
.filter_map(|output| output.trim().split_once("\n"))
6566
.collect::<HashMap<&str, &str>>();
6667

@@ -74,7 +75,7 @@ pub fn compare_outputs(intrinsic_name_list: &Vec<String>, runner: &str, target:
7475
.filter_map(|&&intrinsic| {
7576
let c_output = c_output_map.get(intrinsic).unwrap();
7677
let rust_output = rust_output_map.get(intrinsic).unwrap();
77-
if rust_output.to_string() == c_output.to_string() {
78+
if rust_output.eq(c_output) {
7879
None
7980
} else {
8081
let diff = diff::lines(c_output, rust_output);

crates/intrinsic-test/src/common/gen_c.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::common::intrinsic::Intrinsic;
22

33
use super::argument::Argument;
4+
use super::compare::INTRINSIC_DELIMITER;
45
use super::indentation::Indentation;
56
use super::intrinsic_helpers::IntrinsicTypeDefinition;
67

@@ -149,7 +150,10 @@ pub fn write_main_cpp<'a>(
149150
writeln!(w, "int main(int argc, char **argv) {{")?;
150151

151152
for intrinsic in intrinsics {
152-
writeln!(w, " std::cout << \"############\" << std::endl;")?;
153+
writeln!(
154+
w,
155+
" std::cout << \"{INTRINSIC_DELIMITER}\" << std::endl;"
156+
)?;
153157
writeln!(w, " std::cout << \"{intrinsic}\" << std::endl;")?;
154158
writeln!(w, " run_{intrinsic}();\n")?;
155159
}

crates/intrinsic-test/src/common/gen_rust.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use itertools::Itertools;
22
use std::process::Command;
33

4-
use crate::common::argument::ArgumentList;
5-
use crate::common::intrinsic::Intrinsic;
6-
4+
use super::compare::INTRINSIC_DELIMITER;
75
use super::indentation::Indentation;
86
use super::intrinsic_helpers::IntrinsicTypeDefinition;
7+
use crate::common::argument::ArgumentList;
8+
use crate::common::intrinsic::Intrinsic;
99

1010
// The number of times each intrinsic will be called.
1111
pub(crate) const PASSES: u32 = 20;
@@ -87,7 +87,7 @@ pub fn write_main_rs<'a>(
8787
writeln!(w, "fn main() {{")?;
8888

8989
for binary in intrinsics {
90-
writeln!(w, " println!(\"############\");")?;
90+
writeln!(w, " println!(\"{INTRINSIC_DELIMITER}\");")?;
9191
writeln!(w, " println!(\"{binary}\");")?;
9292
writeln!(w, " run_{binary}();\n")?;
9393
}

0 commit comments

Comments
 (0)