auto merge of #14158 : nikomatsakis/rust/issue-5527-refactor-foldable, r=pcwalton

author bors <bors@rust-lang.org>

Tue, 13 May 2014 15:57:33 +0000 (08:57 -0700)

committer bors <bors@rust-lang.org>

Tue, 13 May 2014 15:57:33 +0000 (08:57 -0700)
author bors <bors@rust-lang.org>
Tue, 13 May 2014 15:57:33 +0000 (08:57 -0700)
committer bors <bors@rust-lang.org>
Tue, 13 May 2014 15:57:33 +0000 (08:57 -0700)
diff --cc src/librustc/middle/ty.rs
Simple merge
diff --cc src/librustc/middle/typeck/check/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 13 May 2014 15:57:33 +0000 (08:57 -0700)
committer	bors <bors@rust-lang.org>
	Tue, 13 May 2014 15:57:33 +0000 (08:57 -0700)
		1	2
src/librustc/middle/ty.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/typeck/check/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history