auto merge of #15867 : cmr/rust/rewrite-lexer4, r=alexcrichton

[rust.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 37a98c45a6bafe74a7dc563a27b9b74e22127688..bc34fc2dcdfbb5cc771b32dae4351fbb7d59857d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -60,31 +60,21 @@ config.mk
 /rt/
 /rustllvm/
 /test/
-/build/
 /inst/
 /mingw-build/
 src/.DS_Store
 /tmp/
+/dist/
 /stage0/
 /dl/
 /stage1/
 /stage2/
 /stage3/
 *.bz2
-/doc/html
-/doc/latex
-/doc/std
-/doc/extra
-/doc/green
-/doc/native
-/doc/rustc
-/doc/syntax
-/doc/rustuv
-/doc/rustpkg
+/doc
 /nd/
 /llvm/
 version.md
-*.tex
 keywords.md
 x86_64-apple-darwin/
 x86_64-unknown-linux-gnu/
@@ -94,7 +84,7 @@ config.stamp
 .DS_Store
 src/etc/dl
 .settings/
-build/
+/build
 i686-pc-mingw32/
-src/librustc/lib/llvmdeps.rs
+src/librustc_llvm/llvmdeps.rs
 *.pot