Auto merge of #37908 - nrc:save-def, r=eddyb

author bors <bors@rust-lang.org>

Wed, 23 Nov 2016 20:31:45 +0000 (14:31 -0600)

committer GitHub <noreply@github.com>

Wed, 23 Nov 2016 20:31:45 +0000 (14:31 -0600)
author bors <bors@rust-lang.org>
Wed, 23 Nov 2016 20:31:45 +0000 (14:31 -0600)
committer GitHub <noreply@github.com>
Wed, 23 Nov 2016 20:31:45 +0000 (14:31 -0600)
diff --cc src/librustc_save_analysis/dump_visitor.rs
Simple merge
diff --cc src/librustc_save_analysis/lib.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 23 Nov 2016 20:31:45 +0000 (14:31 -0600)
committer	GitHub <noreply@github.com>
	Wed, 23 Nov 2016 20:31:45 +0000 (14:31 -0600)
		1	2
src/librustc_save_analysis/dump_visitor.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_save_analysis/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history