Skip to content

Commit 27fa965

Browse files
authored
pre-commit rustfmt all files (#2176)
1 parent 658dd53 commit 27fa965

File tree

3 files changed

+29
-11
lines changed

3 files changed

+29
-11
lines changed

nativelink-config/generate-stores-config/src/main.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,31 @@ fn main() {
2222
for block in json_start.captures_iter(&stores_rs) {
2323
let start_marker = block.get(0).unwrap().end();
2424
let end_match = block_end.find(&stores_rs[start_marker..]).unwrap();
25-
let end_marker =end_match.start();
26-
let contents = &stores_rs[start_marker..(start_marker+end_marker)].split("\n").map(|line| line.replacen("///", "", 1)).collect::<Vec<String>>().join("\n");
25+
let end_marker = end_match.start();
26+
let contents = &stores_rs[start_marker..(start_marker + end_marker)]
27+
.split("\n")
28+
.map(|line| line.replacen("///", "", 1))
29+
.collect::<Vec<String>>()
30+
.join("\n");
2731
blocks.push(contents.trim().to_string());
2832
}
2933

30-
let mut output = String::from("// Generated by generate-stores-config from stores.rs comments for testing
34+
let mut output = String::from(
35+
"// Generated by generate-stores-config from stores.rs comments for testing
3136
{
3237
servers: [],
3338
stores: [
34-
");
39+
",
40+
);
3541

3642
for (index, contents) in blocks.iter().enumerate() {
37-
let more_output = format!(r#" {{
43+
let more_output = format!(
44+
r#" {{
3845
name: "{index}",
3946
{contents}
4047
}},
41-
"#);
48+
"#
49+
);
4250
output.push_str(&more_output);
4351
}
4452
output.push_str("]}\n");

tools/generate-bazel-rc/src/main.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
use std::{collections::BTreeSet, env, fs};
2-
use toml::{Table, Value, map::Map};
1+
use std::collections::BTreeSet;
2+
use std::{env, fs};
3+
4+
use toml::map::Map;
5+
use toml::{Table, Value};
36

47
#[derive(PartialEq, PartialOrd, Clone)]
58
enum LintLevel {
69
Allow,
710
Deny,
8-
Warn
11+
Warn,
912
}
1013

1114
impl LintLevel {
@@ -64,8 +67,13 @@ fn get_lints_from_key(lints_table: &Map<String, Value>, key: &str) -> BTreeSet<L
6467
level: LintLevel::new_from_str(
6568
table["level"].as_str().expect("expected level in table"),
6669
),
67-
priority: i8::try_from(table.get("priority").and_then(|p| p.as_integer()).unwrap_or(0))
68-
.expect("Expected small integer for priority"),
70+
priority: i8::try_from(
71+
table
72+
.get("priority")
73+
.and_then(|p| p.as_integer())
74+
.unwrap_or(0),
75+
)
76+
.expect("Expected small integer for priority"),
6977
});
7078
} else {
7179
panic!("{}", value);

tools/pre-commit-hooks.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ in {
141141
enable = true;
142142
packageOverrides.cargo = nightly-rust.cargo;
143143
packageOverrides.rustfmt = nightly-rust.rustfmt;
144+
pass_filenames = true;
145+
inherit excludes;
144146
};
145147

146148
# Taplo fmt

0 commit comments

Comments
 (0)