From 701b419a122021172da53fee65870f8c0d972506 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 25 Feb 2020 11:01:20 -0800
Subject: [PATCH] Merge gitignore files

---
 .gitignore | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index daa279dbafcb..4c37c4f83d8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,16 @@
 *.bk
-*.swp
+*.pyc
 *.swo
+*.swp
 *.swx
-tags
-target
-.*.rustfmt
-cranelift.dbg*
-rusty-tags.*
 *~
+.*.rustfmt
+.mypy_cache
 \#*\#
+cranelift.dbg*
+docs/_build
 docs/book
 .vscode/
+rusty-tags.*
+tags
+target