auto merge of #16194 : omasanori/rust/gitignore, r=alexcrichton

I also sorted lines in .gitignore. The file might include some obsoleted lines but I left.

1 files changed, 62 insertions, 64 deletions

diff --git a/.gitignore b/.gitignore
index bc34fc2dcdf..1d6ee9e3614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,90 +1,88 @@
-*~
-\#*\#
-\#*
-.#*
-*.x86
-*.llvm
-*.out
+*.a
+*.aux
+*.bc
 *.boot
-*.rustc
+*.bz2
+*.cmi
+*.cmo
 *.cmx
-*.dll
+*.cp
+*.cps
+*.d
+*.dSYM
 *.def
-*.exe
-*.a
-*.rlib
-*.so
+*.diff
+*.dll
 *.dylib
-*.orig
-*.cmo
-*.cmi
-*.dSYM
-*.d
-*.o
-*.ll
-*.bc
-*.aux
-*.cp
+*.elc
+*.epub
+*.exe
 *.fn
+*.html
 *.ky
-*.cps
+*.ll
+*.llvm
 *.log
+*.o
+*.orig
+*.out
+*.patch
 *.pdf
-*.epub
-*.html
 *.pg
-*.toc
-*.tp
-*.vr
-*.patch
-*.diff
+*.pot
+*.pyc
 *.rej
-*.swp
+*.rlib
+*.rustc
+*.so
 *.swo
+*.swp
 *.tmp
-*.pyc
-*.elc
+*.toc
+*.tp
+*.vr
+*.x86
+*~
+.#*
+.DS_Store
+.cproject
 .hg/
 .hgignore
-.cproject
 .project
+.settings/
 .valgrindrc
-lexer.ml
-TAGS
-TAGS.emacs
-TAGS.vi
-version.ml
-version.texi
+/*-*-*-*/
+/*-*-*/
 /Makefile
-config.mk
-/rt/
-/rustllvm/
-/test/
+/build
+/dist/
+/dl/
+/doc
 /inst/
+/llvm/
 /mingw-build/
-src/.DS_Store
-/tmp/
-/dist/
+/nd/
+/rt/
+/rustllvm/
 /stage0/
-/dl/
 /stage1/
 /stage2/
 /stage3/
-*.bz2
-/doc
-/nd/
-/llvm/
-version.md
-keywords.md
-x86_64-apple-darwin/
-x86_64-unknown-linux-gnu/
-i686-unknown-linux-gnu/
-tmp.*.rs
+/test/
+/tmp/
+TAGS
+TAGS.emacs
+TAGS.vi
+\#*
+\#*\#
+config.mk
 config.stamp
-.DS_Store
+keywords.md
+lexer.ml
+src/.DS_Store
 src/etc/dl
-.settings/
-/build
-i686-pc-mingw32/
 src/librustc_llvm/llvmdeps.rs
-*.pot
+tmp.*.rs
+version.md
+version.ml
+version.texi