Merge pull request #1467 from philipturnbull/option_map_nil_fn

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

Sun, 15 Apr 2018 14:14:25 +0000 (16:14 +0200)

committer GitHub <noreply@github.com>

Sun, 15 Apr 2018 14:14:25 +0000 (16:14 +0200)
author Oliver Schneider <oli-obk@users.noreply.github.com>
Sun, 15 Apr 2018 14:14:25 +0000 (16:14 +0200)
committer GitHub <noreply@github.com>
Sun, 15 Apr 2018 14:14:25 +0000 (16:14 +0200)
diff --cc CHANGELOG.md
Simple merge
diff --cc clippy_lints/src/lib.rs
Simple merge
author	Oliver Schneider <oli-obk@users.noreply.github.com>
	Sun, 15 Apr 2018 14:14:25 +0000 (16:14 +0200)
committer	GitHub <noreply@github.com>
	Sun, 15 Apr 2018 14:14:25 +0000 (16:14 +0200)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
clippy_lints/src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history