X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=rustfmt.toml;h=480b19a5e933685cde31dddb4c6076b1169c2174;hb=ae6a1a7043ce68e75cbc740dcdca792057df1555;hp=4b415a31b272eab0995e7f6d8dec936ccdb0146a;hpb=78c740e2f38c64db96124ed62c2c51dee5de9b70;p=rust.git

diff --git a/rustfmt.toml b/rustfmt.toml
index 4b415a31b27..480b19a5e93 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,7 +1,37 @@
-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/",
+    "/*-build/",
+    "/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",
+]