Auto merge of #36331 - petrochenkov:tyadt, r=eddyb

author bors <bors@rust-lang.org>

Fri, 9 Sep 2016 11:57:11 +0000 (04:57 -0700)

committer GitHub <noreply@github.com>

Fri, 9 Sep 2016 11:57:11 +0000 (04:57 -0700)
author bors <bors@rust-lang.org>
Fri, 9 Sep 2016 11:57:11 +0000 (04:57 -0700)
committer GitHub <noreply@github.com>
Fri, 9 Sep 2016 11:57:11 +0000 (04:57 -0700)
diff --cc src/librustc/middle/effect.rs
Simple merge
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>
	Fri, 9 Sep 2016 11:57:11 +0000 (04:57 -0700)
committer	GitHub <noreply@github.com>
	Fri, 9 Sep 2016 11:57:11 +0000 (04:57 -0700)
		1	2
src/librustc/middle/effect.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_save_analysis/dump_visitor.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_save_analysis/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history