Merge remote-tracking branch 'popzxc/if-same-cond-fn' into rollup-new-lints

author flip1995 <hello@philkrones.com>

Sat, 23 Nov 2019 16:54:26 +0000 (17:54 +0100)

committer flip1995 <hello@philkrones.com>

Sat, 23 Nov 2019 16:54:26 +0000 (17:54 +0100)
author flip1995 <hello@philkrones.com>
Sat, 23 Nov 2019 16:54:26 +0000 (17:54 +0100)
committer flip1995 <hello@philkrones.com>
Sat, 23 Nov 2019 16:54:26 +0000 (17:54 +0100)
diff --cc CHANGELOG.md
Simple merge
diff --cc clippy_lints/src/lib.rs
Simple merge
diff --cc src/lintlist/mod.rs
Simple merge
author	flip1995 <hello@philkrones.com>
	Sat, 23 Nov 2019 16:54:26 +0000 (17:54 +0100)
committer	flip1995 <hello@philkrones.com>
	Sat, 23 Nov 2019 16:54:26 +0000 (17:54 +0100)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
clippy_lints/src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/lintlist/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history