diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-02-07T15·50+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-02-08T12·06+0000 |
| commit | d254dbb848ecf093c0de54a9104915f47f782ad1 (patch) | |
| tree | 5e9eefd071fa9cbe83e3ac0d8d1566783995429b | |
| parent | 3d8ee620875085ae7e8d7ef31f4f8e3738cfdca1 (diff) | |
feat(depotfmt): Check & format Rust code with rustfmt r/3792
The rustfmt configuration of the depot is moved to `rustfmt.toml` (it is recognised more reliably from this path than from the hidden .rustfmt.toml). Nested configuration is theoretically possible, but detection of nested config files is flaky. Paths with nested config files need to be disabled in the top-level check (I've excluded my user directory). Change-Id: I385ce3ef529bda28fac03bfba86fc204c81b8a61 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5241 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
| -rw-r--r-- | .rustfmt.toml | 22 | ||||
| -rw-r--r-- | rustfmt.toml | 1 | ||||
| -rw-r--r-- | tools/depotfmt.nix | 7 |
3 files changed, 8 insertions, 22 deletions
diff --git a/.rustfmt.toml b/.rustfmt.toml deleted file mode 100644 index 6ad0d5341a4b..000000000000 --- a/.rustfmt.toml +++ /dev/null @@ -1,22 +0,0 @@ -# This configuration file changes some defaults from the ones -# documented on https://rust-lang.github.io/rustfmt/ -# -# All other settings are left at the defaults. - -edition = "2018" -newline_style = "Unix" -use_try_shorthand = true - -# Unstable settings that we want in the future, once they are -# available: -# -# combine_control_expr = false -# comment_width = 100 -# condense_wildcard_suffixes = true -# format_code_in_doc_comments = true -# inline_attribute_width = 100 -# match_block_trailing_comma = true -# merge_imports = true -# normalize_comments = true -# overflow_delimited_expr = true -# wrap_comments = true diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 000000000000..3a26366d4da6 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1 @@ +edition = "2021" diff --git a/tools/depotfmt.nix b/tools/depotfmt.nix index 21e71bf3b66b..dbd3a31a0d80 100644 --- a/tools/depotfmt.nix +++ b/tools/depotfmt.nix @@ -26,6 +26,13 @@ let "third_party/nix/tests/*", "third_party/nix/src/tests/*" ] + + [formatter.rust] + command = "${pkgs.rustfmt}/bin/rustfmt" + includes = [ "*.rs" ] + excludes = [ + "users/tazjin/*", + ] ''; # helper tool for formatting the depot interactively |