about summary refs log tree commit diff
path: root/rustfmt.toml
diff options
context:
space:
mode:
authorLaurențiu Nicola <lnicola@dend.ro>2024-06-20 08:03:36 +0300
committerLaurențiu Nicola <lnicola@dend.ro>2024-06-20 08:03:36 +0300
commit9d2bb7f40ff91c36b590e743a6e9a92153159d1c (patch)
tree0343d8f8c519d3e76f27f77fbae414eb88ef2738 /rustfmt.toml
parent35d0bcd89fa7454093abcf2c7a8624782c269375 (diff)
parent3d5d7a24f76006b391d8a53d903ae64c1b4a52d2 (diff)
downloadrust-9d2bb7f40ff91c36b590e743a6e9a92153159d1c.tar.gz
rust-9d2bb7f40ff91c36b590e743a6e9a92153159d1c.zip
Merge from rust-lang/rust
Diffstat (limited to 'rustfmt.toml')
-rw-r--r--rustfmt.toml29
1 files changed, 16 insertions, 13 deletions
diff --git a/rustfmt.toml b/rustfmt.toml
index 850d01ea7cb..b15ffdca38a 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -3,25 +3,27 @@ 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
+# Files to ignore. Each entry uses gitignore syntax, but `!` prefixes aren't allowed.
 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)
-    "/tests/*",
+    # Some tests are not formatted, for various reasons.
+    "/tests/codegen/simd-intrinsic/", # Many types like `u8x64` are better hand-formatted.
+    "/tests/crashes/",                # Many of these tests contain syntax errors.
+    "/tests/debuginfo/",              # These tests are somewhat sensitive to source code layout.
+    "/tests/incremental/",            # These tests are somewhat sensitive to source code layout.
+    "/tests/pretty/",                 # These tests are very sensitive to source code layout.
+    "/tests/run-make/translation/test.rs", # This test contains syntax errors.
+    "/tests/rustdoc/",                # Some have syntax errors, some are whitespace-sensitive.
+    "/tests/rustdoc-gui/",            # Some tests are sensitive to source code layout.
+    "/tests/rustdoc-ui/",             # Some have syntax errors, some are whitespace-sensitive.
+    "/tests/ui/",                     # Some have syntax errors, some are whitespace-sensitive.
+    "/tests/ui-fulldeps/",            # Some are whitespace-sensitive (e.g. `// ~ERROR` comments).
 
-    # but we still want to format rmake.rs files in tests/run-make/ so we need to do this
-    # dance to avoid the parent directory from being excluded
-    "!/tests/run-make/",
-    "/tests/run-make/*/*.rs",
-    "!/tests/run-make/*/rmake.rs",
-
-    # do not format submodules
+    # Do not format submodules.
     # FIXME: sync submodule list with tidy/bootstrap/etc
     # tidy/src/walk.rs:filter_dirs
     "library/backtrace",
@@ -40,9 +42,10 @@ ignore = [
     "src/tools/clippy",
     "src/tools/miri",
     "src/tools/rust-analyzer",
+    "src/tools/rustc-perf",
     "src/tools/rustfmt",
 
-    # these are ignored by a standard cargo fmt run
+    # These are ignored by a standard cargo fmt run.
     "compiler/rustc_codegen_cranelift/scripts",
     "compiler/rustc_codegen_cranelift/example/gen_block_iterate.rs", # uses edition 2024
 ]