Rollup merge of #64703 - llogiq:slices-elems-are-equidistant, r=rkruppe

[rust.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5e536ccf615a1cf28d14a36128b809826de5afdc..81a472451d777435d9ac39589de08c80a56bd7a4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# This file should only ignore things that are generatd during a build,
+# 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.
@@ -19,14 +19,16 @@ __pycache__/
 .vscode
 .favorites.json
 /Makefile
-/build
+/build/
 /config.toml
 /dist/
 /dl/
-/doc
+/doc/
 /inst/
 /llvm/
 /mingw-build/
+# Created by default with `src/ci/docker/run.sh`:
+/obj/
 /rustllvm/
 /src/libcore/unicode/DerivedCoreProperties.txt
 /src/libcore/unicode/DerivedNormalizationProps.txt
@@ -36,6 +38,9 @@ __pycache__/
 /src/libcore/unicode/SpecialCasing.txt
 /src/libcore/unicode/UnicodeData.txt
 /src/libcore/unicode/downloaded
+/target/
+# Generated by compiletest for incremental:
+/tmp/
 tags
 tags.*
 TAGS
@@ -45,6 +50,5 @@ TAGS.*
 config.mk
 config.stamp
 Session.vim
-src/etc/dl
 .cargo
 no_llvm_build