Merge pull request #2043 from sunjay/lift_generics

author Nick Cameron <nrc@ncameron.org>

Sat, 28 Oct 2017 05:14:13 +0000 (18:14 +1300)

committer GitHub <noreply@github.com>

Sat, 28 Oct 2017 05:14:13 +0000 (18:14 +1300)
author Nick Cameron <nrc@ncameron.org>
Sat, 28 Oct 2017 05:14:13 +0000 (18:14 +1300)
committer GitHub <noreply@github.com>
Sat, 28 Oct 2017 05:14:13 +0000 (18:14 +1300)
diff --cc src/items.rs
Simple merge
diff --cc src/visitor.rs
Simple merge
author	Nick Cameron <nrc@ncameron.org>
	Sat, 28 Oct 2017 05:14:13 +0000 (18:14 +1300)
committer	GitHub <noreply@github.com>
	Sat, 28 Oct 2017 05:14:13 +0000 (18:14 +1300)
		1	2
src/items.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/visitor.rs	patch \|	diff1 \|	diff2 \|	blob \| history