Auto merge of #33853 - alexcrichton:remove-deprecated, r=aturon

author bors <bors@rust-lang.org>

Wed, 1 Jun 2016 22:11:38 +0000 (15:11 -0700)

committer bors <bors@rust-lang.org>

Wed, 1 Jun 2016 22:11:38 +0000 (15:11 -0700)
author bors <bors@rust-lang.org>
Wed, 1 Jun 2016 22:11:38 +0000 (15:11 -0700)
committer bors <bors@rust-lang.org>
Wed, 1 Jun 2016 22:11:38 +0000 (15:11 -0700)
diff --cc src/libcore/cell.rs
Simple merge
diff --cc src/libcore/str/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 1 Jun 2016 22:11:38 +0000 (15:11 -0700)
committer	bors <bors@rust-lang.org>
	Wed, 1 Jun 2016 22:11:38 +0000 (15:11 -0700)
		1	2
src/libcore/cell.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libcore/str/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history