X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=rustfmt.toml;h=af807aa6f739e75c4e61d7cefd61f89df4487296;hb=8b9b106cdc9b48f419e8346a0b7e35d2d9c7de6f;hp=4b415a31b272eab0995e7f6d8dec936ccdb0146a;hpb=e50afa43d0ed32fad86514e2cfcc72d20d38448a;p=rust.git

diff --git a/rustfmt.toml b/rustfmt.toml
index 4b415a31b27..af807aa6f73 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,7 +1,35 @@
-max_width = 120
-comment_width = 100
-match_block_trailing_comma = true
-wrap_comments = true
-edition = "2018"
-error_on_line_overflow = true
+# Run rustfmt with this config (it should be picked up automatically).
 version = "Two"
+use_small_heuristics = "Max"
+merge_derives = false
+
+# by default we ignore everything in the repository
+# tidy only checks files which are not ignored, each entry follows gitignore style
+ignore = [
+    "/build/",
+    "/vendor/",
+
+    # tests for now are not formatted, as they are sometimes pretty-printing constrained
+    # (and generally rustfmt can move around comments in UI-testing incompatible ways)
+    "src/test",
+
+    # do not format submodules
+    "library/backtrace",
+    "library/stdarch",
+    "compiler/rustc_codegen_cranelift",
+    "src/doc/book",
+    "src/doc/edition-guide",
+    "src/doc/embedded-book",
+    "src/doc/nomicon",
+    "src/doc/reference",
+    "src/doc/rust-by-example",
+    "src/doc/rustc-dev-guide",
+    "src/llvm-project",
+    "src/tools/cargo",
+    "src/tools/clippy",
+    "src/tools/miri",
+    "src/tools/rls",
+    "src/tools/rust-analyzer",
+    "src/tools/rustfmt",
+    "src/tools/rust-installer",
+]