Merge pull request #1647 from topecongiro/refactor-impl-format

author Nick Cameron <nrc@ncameron.org>

Mon, 12 Jun 2017 23:55:33 +0000 (11:55 +1200)

committer GitHub <noreply@github.com>

Mon, 12 Jun 2017 23:55:33 +0000 (11:55 +1200)
author Nick Cameron <nrc@ncameron.org>
Mon, 12 Jun 2017 23:55:33 +0000 (11:55 +1200)
committer GitHub <noreply@github.com>
Mon, 12 Jun 2017 23:55:33 +0000 (11:55 +1200)
diff --cc src/expr.rs
Simple merge
diff --cc src/items.rs
Simple merge
author	Nick Cameron <nrc@ncameron.org>
	Mon, 12 Jun 2017 23:55:33 +0000 (11:55 +1200)
committer	GitHub <noreply@github.com>
	Mon, 12 Jun 2017 23:55:33 +0000 (11:55 +1200)
		1	2
src/expr.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/items.rs	patch \|	diff1 \|	diff2 \|	blob \| history