Auto merge of #38203 - nrc:save-wr, r=eddyb

author bors <bors@rust-lang.org>

Fri, 9 Dec 2016 18:43:33 +0000 (18:43 +0000)

committer bors <bors@rust-lang.org>

Fri, 9 Dec 2016 18:43:33 +0000 (18:43 +0000)
author bors <bors@rust-lang.org>
Fri, 9 Dec 2016 18:43:33 +0000 (18:43 +0000)
committer bors <bors@rust-lang.org>
Fri, 9 Dec 2016 18:43:33 +0000 (18:43 +0000)
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 Dec 2016 18:43:33 +0000 (18:43 +0000)
committer	bors <bors@rust-lang.org>
	Fri, 9 Dec 2016 18:43:33 +0000 (18:43 +0000)
		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