Skip to content

Commit 1ba1b0d

Browse files
committed
Rustfmt
1 parent ec8c71f commit 1ba1b0d

File tree

2 files changed

+56
-14
lines changed

2 files changed

+56
-14
lines changed

crates/intrinsic-test/src/main.rs

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ pub enum Language {
3131

3232
fn gen_code_c(intrinsic: &Intrinsic, constraints: &[&Argument], name: String) -> String {
3333
if let Some((current, constraints)) = constraints.split_last() {
34-
let range = current.constraints.iter().map(|c| c.to_range()).flat_map(|r| r.into_iter());
34+
let range = current
35+
.constraints
36+
.iter()
37+
.map(|c| c.to_range())
38+
.flat_map(|r| r.into_iter());
3539

3640
range
3741
.map(|i| {
@@ -48,12 +52,19 @@ fn gen_code_c(intrinsic: &Intrinsic, constraints: &[&Argument], name: String) ->
4852
})
4953
.collect()
5054
} else {
51-
(1..20).map(|idx| intrinsic.generate_pass_c(idx, &name)).collect::<Vec<_>>().join("\n")
55+
(1..20)
56+
.map(|idx| intrinsic.generate_pass_c(idx, &name))
57+
.collect::<Vec<_>>()
58+
.join("\n")
5259
}
5360
}
5461

5562
fn generate_c_program(header_files: &[&str], intrinsic: &Intrinsic) -> String {
56-
let constraints = intrinsic.arguments.iter().filter(|i| i.has_constraint()).collect_vec();
63+
let constraints = intrinsic
64+
.arguments
65+
.iter()
66+
.filter(|i| i.has_constraint())
67+
.collect_vec();
5768

5869
format!(
5970
r#"{header_files}
@@ -99,7 +110,11 @@ int main(int argc, char **argv) {{
99110

100111
fn gen_code_rust(intrinsic: &Intrinsic, constraints: &[&Argument], name: String) -> String {
101112
if let Some((current, constraints)) = constraints.split_last() {
102-
let range = current.constraints.iter().map(|c| c.to_range()).flat_map(|r| r.into_iter());
113+
let range = current
114+
.constraints
115+
.iter()
116+
.map(|c| c.to_range())
117+
.flat_map(|r| r.into_iter());
103118

104119
range
105120
.map(|i| {
@@ -116,12 +131,19 @@ fn gen_code_rust(intrinsic: &Intrinsic, constraints: &[&Argument], name: String)
116131
})
117132
.collect()
118133
} else {
119-
(1..20).map(|idx| intrinsic.generate_pass_rust(idx, &name)).collect::<Vec<_>>().join("\n")
134+
(1..20)
135+
.map(|idx| intrinsic.generate_pass_rust(idx, &name))
136+
.collect::<Vec<_>>()
137+
.join("\n")
120138
}
121139
}
122140

123141
fn generate_rust_program(intrinsic: &Intrinsic, a32: bool) -> String {
124-
let constraints = intrinsic.arguments.iter().filter(|i| i.has_constraint()).collect_vec();
142+
let constraints = intrinsic
143+
.arguments
144+
.iter()
145+
.filter(|i| i.has_constraint())
146+
.collect_vec();
125147

126148
format!(
127149
r#"#![feature(simd_ffi)]
@@ -239,7 +261,11 @@ path = "{intrinsic}/main.rs""#,
239261
.arg(format!(
240262
"cargo {toolchain} build --target {target}",
241263
toolchain = toolchain,
242-
target = if a32 { "armv7-unknown-linux-gnueabihf" } else { "aarch64-unknown-linux-gnu" },
264+
target = if a32 {
265+
"armv7-unknown-linux-gnueabihf"
266+
} else {
267+
"aarch64-unknown-linux-gnu"
268+
},
243269
))
244270
.output();
245271
if let Ok(output) = output {
@@ -304,13 +330,19 @@ fn main() {
304330
.get_matches();
305331

306332
let filename = matches.value_of("INPUT").unwrap();
307-
let toolchain = matches.value_of("TOOLCHAIN").map_or("".into(), |t| format!("+{}", t));
333+
let toolchain = matches
334+
.value_of("TOOLCHAIN")
335+
.map_or("".into(), |t| format!("+{}", t));
308336

309337
let cpp_compiler = matches.value_of("CPPCOMPILER").unwrap();
310338
let c_runner = matches.value_of("RUNNER").unwrap_or("");
311339
let skip = if let Some(filename) = matches.value_of("SKIP") {
312340
let data = std::fs::read_to_string(&filename).expect("Failed to open file");
313-
data.lines().map(str::trim).filter(|s| !s.contains('#')).map(String::from).collect_vec()
341+
data.lines()
342+
.map(str::trim)
343+
.filter(|s| !s.contains('#'))
344+
.map(String::from)
345+
.collect_vec()
314346
} else {
315347
Default::default()
316348
};
@@ -326,7 +358,9 @@ fn main() {
326358
.filter(|i| !(i.results.kind() == TypeKind::Float && i.results.inner_size() == 16))
327359
.filter(|i| !i.arguments.iter().any(|a| a.ty.kind() == TypeKind::BFloat))
328360
.filter(|i| {
329-
!i.arguments.iter().any(|a| a.ty.kind() == TypeKind::Float && a.ty.inner_size() == 16)
361+
!i.arguments
362+
.iter()
363+
.any(|a| a.ty.kind() == TypeKind::Float && a.ty.inner_size() == 16)
330364
})
331365
// Skip pointers for now, we would probably need to look at the return
332366
// type to work out how many elements we need to point to.
@@ -394,15 +428,23 @@ fn compare_outputs(intrinsics: &Vec<Intrinsic>, toolchain: &str, runner: &str, a
394428
}
395429

396430
if !rust.status.success() {
397-
error!("Failed to run rust program for intrinsic {}", intrinsic.name);
431+
error!(
432+
"Failed to run rust program for intrinsic {}",
433+
intrinsic.name
434+
);
398435
return Some(FailureReason::RunRust(intrinsic.name.clone()));
399436
}
400437

401438
info!("Comparing intrinsic: {}", intrinsic.name);
402439

403-
let c = std::str::from_utf8(&c.stdout).unwrap().to_lowercase().replace("-nan", "nan");
404-
let rust =
405-
std::str::from_utf8(&rust.stdout).unwrap().to_lowercase().replace("-nan", "nan");
440+
let c = std::str::from_utf8(&c.stdout)
441+
.unwrap()
442+
.to_lowercase()
443+
.replace("-nan", "nan");
444+
let rust = std::str::from_utf8(&rust.stdout)
445+
.unwrap()
446+
.to_lowercase()
447+
.replace("-nan", "nan");
406448

407449
if c == rust {
408450
None

rustfmt.toml

Whitespace-only changes.

0 commit comments

Comments
 (0)