Rollup merge of #65057 - mathstuf:fix-warning-typo, r=Centril

[rust.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 87fec41415272bace9824cb2ab04697754a928d3..81a472451d777435d9ac39589de08c80a56bd7a4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+# This file should only ignore things that are generated during a build,
+# generated by common IDEs, and optional files controlled by the user
+# that affect the build (such as config.toml).
+# FIXME: This needs cleanup.
 *~
 .#*
 .DS_Store
@@ -14,20 +18,17 @@ __pycache__/
 .valgrindrc
 .vscode
 .favorites.json
-/*-*-*-*/
-/*-*-*/
 /Makefile
-/build
+/build/
 /config.toml
 /dist/
 /dl/
-/doc
+/doc/
 /inst/
 /llvm/
 /mingw-build/
-/nd/
+# Created by default with `src/ci/docker/run.sh`:
 /obj/
-/rt/
 /rustllvm/
 /src/libcore/unicode/DerivedCoreProperties.txt
 /src/libcore/unicode/DerivedNormalizationProps.txt
@@ -37,10 +38,8 @@ __pycache__/
 /src/libcore/unicode/SpecialCasing.txt
 /src/libcore/unicode/UnicodeData.txt
 /src/libcore/unicode/downloaded
-/stage[0-9]+/
-/target
-target/
-/test/
+/target/
+# Generated by compiletest for incremental:
 /tmp/
 tags
 tags.*
@@ -50,18 +49,6 @@ TAGS.*
 \#*\#
 config.mk
 config.stamp
-keywords.md
-lexer.ml
-mir_dump
 Session.vim
-src/etc/dl
-tmp.*.rs
-version.md
-version.ml
-version.texi
 .cargo
-!src/vendor/**
-/src/target/
-
 no_llvm_build
-