Merge pull request #1501 from scott-linder/types-borrow-box

author Oliver Schneider <oli-obk@users.noreply.github.com>

Tue, 13 Jun 2017 09:30:52 +0000 (11:30 +0200)

committer GitHub <noreply@github.com>

Tue, 13 Jun 2017 09:30:52 +0000 (11:30 +0200)
author Oliver Schneider <oli-obk@users.noreply.github.com>
Tue, 13 Jun 2017 09:30:52 +0000 (11:30 +0200)
committer GitHub <noreply@github.com>
Tue, 13 Jun 2017 09:30:52 +0000 (11:30 +0200)
diff --cc README.md
Simple merge
diff --cc clippy_lints/src/lib.rs
Simple merge
author	Oliver Schneider <oli-obk@users.noreply.github.com>
	Tue, 13 Jun 2017 09:30:52 +0000 (11:30 +0200)
committer	GitHub <noreply@github.com>
	Tue, 13 Jun 2017 09:30:52 +0000 (11:30 +0200)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
clippy_lints/src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history